Changeset c8dc9ac in mainline for uspace/lib/c/generic/str.c

Timestamp:

2016-10-11T08:20:59Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

48eb2fc2

Parents:

6eda732 (diff), 523b17a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~werkov/helenos/various-fixes

File:

• uspace/lib/c/generic/str.c (modified) (5 diffs)

uspace/lib/c/generic/str.c

@@ -1157 +1157 @@
                 memmove(str, &str[pos], str_sz - pos);
                 pos = str_sz - pos;
-                str[str_sz - pos] = '\0';
+                str[pos] = '\0';
         }
 }
@@ -1250 +1250 @@
 }
 
-/** Convert string to a number. 
+/** Convert string to a number.
  * Core of strtol and strtoul functions.
  *
@@ -1296 +1296 @@
                                 str += 2;
                         }
-                } 
+                }
         }
         
@@ -1335 +1335 @@
                 *endptr = (char *) str;
 
-        if (nptr == str) { 
+        if (nptr == str) {
                 /*FIXME: errno = EINVAL*/
                 return 0;
@@ -1366 +1366 @@
                 if ((sgn) && (number == (unsigned long) (LONG_MAX) + 1)) {
                         /* FIXME: set 0 to errno */
-                        return number;          
+                        return number;
                 }
                 /* FIXME: set ERANGE to errno */
-                return (sgn ? LONG_MIN : LONG_MAX);     
+                return (sgn ? LONG_MIN : LONG_MAX);
         }