spelling

[simgrid.git] / src / xbt / xbt_str.cpp

diff --git a/src/xbt/xbt_str.cpp b/src/xbt/xbt_str.cpp
index 1146eef..bead714 100644 (file)
--- a/src/xbt/xbt_str.cpp
+++ b/src/xbt/xbt_str.cpp
@@ -56,7 +56,7 @@ void xbt_str_rtrim(char *s, const char *char_list)
 
 /**  @brief Strip whitespace (or other characters) from the beginning of a string.
  *
- * Strips the whitespaces from the begining of s.
+ * Strips the whitespaces from the beginning of s.
  * By default (when char_list=nullptr), these characters get stripped:
  *
  *  - " "    (ASCII 32  (0x20))  space.
@@ -94,7 +94,7 @@ void xbt_str_ltrim(char *s, const char *char_list)
   memmove(s, cur, strlen(cur) + 1);
 }
 
-/**  @brief Strip whitespace (or other characters) from the end and the begining of a string.
+/**  @brief Strip whitespace (or other characters) from the end and the beginning of a string.
  *
  * Strips the whitespaces from both the beginning and the end of s.
  * By default (when char_list=nullptr), these characters get stripped:
@@ -123,7 +123,7 @@ void xbt_str_trim(char *s, const char *char_list)
  * @param str the string to modify
  * @param from char to search
  * @param to char to put instead
- * @param occurence number of changes to do (=0 means all)
+ * @param occurrence number of changes to do (=0 means all)
  */
 void xbt_str_subst(char *str, char from, char to, int occurence)
 {
@@ -219,12 +219,11 @@ xbt_dynar_t xbt_str_split_str(const char *s, const char *sep)
 
   while (not done) {
     char *to_push;
-    int v = 0;
     // get the start of the first occurrence of the substring
     q = strstr(p, sep);
     //if substring was not found add the entire string
     if (nullptr == q) {
-      v = strlen(p);
+      int v   = strlen(p);
       to_push = (char*) xbt_malloc(v + 1);
       memcpy(to_push, p, v);
       to_push[v] = '\0';
@@ -372,7 +371,8 @@ xbt_dynar_t xbt_str_split_quoted(const char *s)
 /** @brief Join a set of strings as a single string */
 char *xbt_str_join(xbt_dynar_t dyn, const char *sep)
 {
-  int len = 1, dyn_len = xbt_dynar_length(dyn);
+  int len     = 1;
+  int dyn_len = xbt_dynar_length(dyn);
   unsigned int cpt;
   char* cursor;