Changeset 81f70b4 in mainline for uspace/lib

Timestamp:

2012-03-31T18:14:08Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d5f99e6

Parents:

95c9158 (diff), 2f4fa79 (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:

Mainline changes and some usb fixes.

Location:

uspace/lib

Files:

• c/generic/str.c (modified) (1 diff)
• c/include/str.h (modified) (1 diff)
• usb/src/dev.c (modified) (1 diff)

uspace/lib/c/generic/str.c

@@ -1535 +1535 @@
  *
  */
-int str_uint64(const char *nptr, char **endptr, unsigned int base,
+int str_uint64_t(const char *nptr, char **endptr, unsigned int base,
     bool strict, uint64_t *result)
 {

uspace/lib/c/include/str.h

@@ -106 +106 @@
 extern int str_uint16_t(const char *, char **, unsigned int, bool, uint16_t *);
 extern int str_uint32_t(const char *, char **, unsigned int, bool, uint32_t *);
-extern int str_uint64(const char *, char **, unsigned int, bool, uint64_t *);
+extern int str_uint64_t(const char *, char **, unsigned int, bool, uint64_t *);
 extern int str_size_t(const char *, char **, unsigned int, bool, size_t *);
 

uspace/lib/usb/src/dev.c

@@ -122 +122 @@
         char *ptr;
 
-        rc = str_uint64(path, &ptr, 10, false, &sid);
+        rc = str_uint64_t(path, &ptr, 10, false, &sid);
         if (rc != EOK) {
                 return false;