Changeset 37e4025 in mainline

Timestamp:

2011-11-04T22:22:05Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

99a1a56

Parents:

2179cf95

Message:

libusbdev: Use asprintf instead of 256 byte buffer for match strings.

File:

• uspace/lib/usbdev/src/recognise.c (modified) (5 diffs)

uspace/lib/usbdev/src/recognise.c

@@ -66 +66 @@
 #define BCD_ARGS(a) BCD_INT((a)), BCD_FRAC((a))
 
-/* FIXME: make this dynamic */
-#define MATCH_STRING_MAX 256
-
 /** Add formatted match id.
  *
@@ -77 +74 @@
  */
 static int usb_add_match_id(match_id_list_t *matches, int score,
-    const char *format, ...)
+    const char *match_str)
 {
-        char *match_str = NULL;
-        match_id_t *match_id = NULL;
-        int rc;
-        
-        match_str = malloc(MATCH_STRING_MAX + 1);
-        if (match_str == NULL) {
-                rc = ENOMEM;
-                goto failure;
-        }
-
-        /*
-         * FIXME: replace with dynamic allocation of exact size
-         */
-        va_list args;
-        va_start(args, format   );
-        vsnprintf(match_str, MATCH_STRING_MAX, format, args);
-        match_str[MATCH_STRING_MAX] = 0;
-        va_end(args);
-
-        match_id = create_match_id();
+        assert(matches);
+
+        match_id_t *match_id = create_match_id();
         if (match_id == NULL) {
-                rc = ENOMEM;
-                goto failure;
+                return ENOMEM;
         }
 
@@ -109 +88 @@
 
         return EOK;
-        
-failure:
-        if (match_str != NULL) {
-                free(match_str);
-        }
-        if (match_id != NULL) {
-                match_id->id = NULL;
-                delete_match_id(match_id);
-        }
-        
-        return rc;
 }
 
@@ -131 +99 @@
 #define ADD_MATCHID_OR_RETURN(match_ids, score, format, ...) \
         do { \
-                int __rc = usb_add_match_id((match_ids), (score), \
-                    format, ##__VA_ARGS__); \
+                char *str = NULL; \
+                int __rc = asprintf(&str, format, ##__VA_ARGS__); \
+                if (__rc > 0) { \
+                        __rc = usb_add_match_id((match_ids), (score), str); \
+                } \
                 if (__rc != EOK) { \
+                        free(str); \
                         return __rc; \
                 } \
@@ -152 +124 @@
     match_id_list_t *matches)
 {
-        if (desc_interface == NULL) {
-                return EINVAL;
-        }
-        if (matches == NULL) {
+        if (desc_interface == NULL || matches == NULL) {
                 return EINVAL;
         }