Changeset bbda5ab in mainline for uspace/lib/c/generic/sysinfo.c

Timestamp:

2010-04-18T12:15:18Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e1b6742

Parents:

3d482e0

Message:

use realloc

File:

• uspace/lib/c/generic/sysinfo.c (modified) (2 diffs)

uspace/lib/c/generic/sysinfo.c

@@ -103 +103 @@
            in common cases. */
         
+        void *data = NULL;
+        
         while (true) {
                 /* Get the binary data size */
                 int ret = sysinfo_get_data_size(path, size);
-                if (ret != EOK) {
-                        /* Not binary data item */
-                        return NULL;
+                if ((ret != EOK) || (size == 0)) {
+                        /* Not a binary data item
+                           or an empty item */
+                        break;
                 }
                 
-                void *data = malloc(*size);
+                data = realloc(data, *size);
                 if (data == NULL)
-                        return NULL;
+                        break;
                 
                 /* Get the data */
@@ -121 +124 @@
                         return data;
                 
-                /* Dispose the buffer */
-                free(data);
-                
                 if (ret != ENOMEM) {
                         /* The failure to get the data was not caused
                            by wrong buffer size */
-                        return NULL;
+                        break;
                 }
         }
+        
+        if (data != NULL)
+                free(data);
+        
+        *size = 0;
+        return NULL;
 }