Changeset 61bfc370 in mainline for uspace/lib/c/include

Timestamp:

2011-01-07T18:57:55Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e08a733

Parents:

7c34b28f

Message:

• make measured_string and other network-related data types binary-safe
• fix several network-related routines binary-safe (replace clearly suspicious use of str_lcmp() with bcmp())
• rename spawn() to net_spawn()

Location:

uspace/lib/c/include

Files:

• adt/char_map.h (modified) (3 diffs)
• adt/generic_char_map.h (modified) (4 diffs)
• adt/measured_strings.h (modified) (1 diff)
• mem.h (modified) (1 diff)

uspace/lib/c/include/adt/char_map.h

@@ -41 +41 @@
 
 /** Invalid assigned value used also if an entry does not exist. */
-#define CHAR_MAP_NULL   (-1)
+#define CHAR_MAP_NULL  (-1)
 
 /** Type definition of the character string to integer map.
  *  @see char_map
  */
-typedef struct char_map char_map_t;
+typedef struct char_map char_map_t;
 
 /** Character string to integer map item.
@@ -56 +56 @@
 struct char_map {
         /** Actually mapped character. */
-        char c;
+        uint8_t c;
         /** Stored integral value. */
         int value;
@@ -71 +71 @@
 extern int char_map_initialize(char_map_t *);
 extern void char_map_destroy(char_map_t *);
-extern int char_map_exclude(char_map_t *, const char *, size_t);
-extern int char_map_add(char_map_t *, const char *, size_t, const int);
-extern int char_map_find(const char_map_t *, const char *, size_t);
-extern int char_map_update(char_map_t *, const char *, size_t, const int);
+extern int char_map_exclude(char_map_t *, const uint8_t *, size_t);
+extern int char_map_add(char_map_t *, const uint8_t *, size_t, const int);
+extern int char_map_find(const char_map_t *, const uint8_t *, size_t);
+extern int char_map_update(char_map_t *, const uint8_t *, size_t, const int);
 
 #endif

uspace/lib/c/include/adt/generic_char_map.h

@@ -62 +62 @@
         }; \
         \
-        int name##_add(name##_t *, const char *, const size_t, type *); \
+        int name##_add(name##_t *, const uint8_t *, const size_t, type *); \
         int name##_count(name##_t *); \
         void name##_destroy(name##_t *); \
-        void name##_exclude(name##_t *, const char *, const size_t); \
-        type *name##_find(name##_t *, const char *, const size_t); \
+        void name##_exclude(name##_t *, const uint8_t *, const size_t); \
+        type *name##_find(name##_t *, const uint8_t *, const size_t); \
         int name##_initialize(name##_t *); \
         int name##_is_valid(name##_t *);
@@ -74 +74 @@
  * Should follow declaration with the same parameters.
  *
- * @param[in] name      Name of the map.
- * @param[in] type      Inner object type.
+ * @param[in] name Name of the map.
+ * @param[in] type Inner object type.
+ *
  */
 #define GENERIC_CHAR_MAP_IMPLEMENT(name, type) \
         GENERIC_FIELD_IMPLEMENT(name##_items, type) \
         \
-        int name##_add(name##_t *map, const char *name, const size_t length, \
+        int name##_add(name##_t *map, const uint8_t *name, const size_t length, \
              type *value) \
         { \
@@ -112 +113 @@
         } \
         \
-        void name##_exclude(name##_t *map, const char *name, \
+        void name##_exclude(name##_t *map, const uint8_t *name, \
             const size_t length) \
         { \
@@ -124 +125 @@
         } \
         \
-        type *name##_find(name##_t *map, const char *name, \
+        type *name##_find(name##_t *map, const uint8_t *name, \
             const size_t length) \
         { \

uspace/lib/c/include/adt/measured_strings.h

@@ -54 +54 @@
 struct measured_string {
         /** Character string data. */
-        char *value;
+        uint8_t *value;
         /** Character string length. */
         size_t length;
 };
 
-extern measured_string_t *measured_string_create_bulk(const char *, size_t);
+extern measured_string_t *measured_string_create_bulk(const uint8_t *, size_t);
 extern measured_string_t *measured_string_copy(measured_string_t *);
-extern int measured_strings_receive(measured_string_t **, char **, size_t);
+extern int measured_strings_receive(measured_string_t **, uint8_t **, size_t);
 extern int measured_strings_reply(const measured_string_t *, size_t);
-extern int measured_strings_return(int, measured_string_t **, char **, size_t);
+extern int measured_strings_return(int, measured_string_t **, uint8_t **, size_t);
 extern int measured_strings_send(int, const measured_string_t *, size_t);
 

uspace/lib/c/include/mem.h

@@ -44 +44 @@
 extern void *memmove(void *, const void *, size_t);
 
-extern int bcmp(const char *, const char *, size_t);
+extern int bcmp(const void *, const void *, size_t);
 
 #endif