Changes in / [cf3aee19:2654afb] in mainline

Location:

uspace

Files:

• Makefile.common (modified) (1 diff)
• lib/c/Makefile (modified) (1 diff)
• lib/c/generic/str.c (modified) (7 diffs)
• lib/c/test/main.c (modified) (1 diff)
• lib/c/test/str.c (deleted)

uspace/Makefile.common

@@ -415 +415 @@
 
 $(DEPEND): $(PRE_DEPEND)
-        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -- $(SOURCES) > $@ 2> /dev/null
-        makedepend -f - -o.test.o -- $(DEPEND_DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(TEST_CFLAGS) -- $(TEST_SOURCES) >> $@ 2> /dev/null
+        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -- $(SOURCES) $(TEST_SOURCES) > $@ 2> /dev/null
         -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@
 

uspace/lib/c/Makefile

@@ -169 +169 @@
 TEST_SOURCES = \
         test/main.c \
-        test/sprintf.c \
-        test/str.c
+        test/sprintf.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/c/generic/str.c

@@ -534 +534 @@
 
                 if (c1 == 0 || c2 == 0)
-                        break;
+                        break;          
         }
 
@@ -588 +588 @@
                         break;
 
-                ++len;
+                ++len;  
         }
 
@@ -1058 +1058 @@
                 memmove(str, &str[pos], str_sz - pos);
                 pos = str_sz - pos;
-                str[pos] = '\0';
+                str[str_sz - pos] = '\0';
         }
 }
@@ -1151 +1151 @@
 }
 
-/** Convert string to a number.
+/** Convert string to a number. 
  * Core of strtol and strtoul functions.
  *
@@ -1197 +1197 @@
                                 str += 2;
                         }
-                }
+                } 
         }
         
@@ -1236 +1236 @@
                 *endptr = (char *) str;
 
-        if (nptr == str) {
+        if (nptr == str) { 
                 /*FIXME: errno = EINVAL*/
                 return 0;
@@ -1267 +1267 @@
                 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);     
         }
         

uspace/lib/c/test/main.c

@@ -33 +33 @@
 
 PCUT_IMPORT(sprintf);
-PCUT_IMPORT(str);
 
 PCUT_MAIN()