From b4beb162fd4c4a848942b82ed036b447d2c11481 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Thu, 12 May 2016 07:52:36 +1000 Subject: [PATCH] library: minor fix for procps_meminfo_select MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proc/meminfo.c b/proc/meminfo.c index 3828d66d..b3a3e56d 100644 --- a/proc/meminfo.c +++ b/proc/meminfo.c @@ -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;