]> granicus.if.org Git - procps-ng/commitdiff
library: minor fix for procps_meminfo_select
authorCraig Small <csmall@enc.com.au>
Wed, 11 May 2016 21:52:36 +0000 (07:52 +1000)
committerCraig Small <csmall@enc.com.au>
Wed, 11 May 2016 21:52:36 +0000 (07:52 +1000)
Thus function returns a pointer, not an int, so if there is
an error return NULL and not -errno.

proc/meminfo.c: In function ‘procps_meminfo_select’:
proc/meminfo.c:994:20: warning: return makes pointer from integer
without a cast [-Wint-conversion]
             return -ENOMEM;

References:
 commit 407f1b71de3c4baed23d897b86ad316b64ad1ec9

proc/meminfo.c

index 3828d66d6abb174096ddf36731ecba22446a06ca..b3a3e56df999e010dd8b7208e2a3345546c6eeb5 100644 (file)
@@ -991,7 +991,7 @@ PROCPS_EXPORT struct meminfo_stack *procps_meminfo_select (
     || memcmp(info->items, items, sizeof(enum meminfo_item) * numitems)) {
         // allow for our PROCPS_MEMINFO_logical_end
         if (!(info->items = realloc(info->items, sizeof(enum meminfo_item) * (numitems + 1))))
-            return -ENOMEM;
+            return NULL;
         memcpy(info->items, items, sizeof(enum meminfo_item) * numitems);
         info->items[numitems] = PROCPS_MEMINFO_logical_end;
         info->numitems = numitems + 1;