From b428530fead73c7c15d9dce78729b7bf94658a7d Mon Sep 17 00:00:00 2001 From: Matt Fleming Date: Tue, 3 Apr 2012 12:12:50 +0100 Subject: [PATCH] meminfo: If we allocate with lmalloc() we should free with lfree() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Since commit 74518b8b691c ("elflink: Make ELF the default object format") we've been using lmalloc() with free() instead of lfree(). This bug was pointed out by the following build warnings, meminfo.c: In function ‘dump_e820’: meminfo.c:93:5: warning: implicit declaration of function ‘free’ meminfo.c:93:5: warning: incompatible implicit declaration of built-in function ‘free’ vesainfo.c: In function ‘print_modes’: vesainfo.c:82:2: warning: implicit declaration of function ‘free’ vesainfo.c:82:2: warning: incompatible implicit declaration of built-in function ‘free’ Signed-off-by: Matt Fleming --- com32/modules/meminfo.c | 8 ++++---- com32/modules/vesainfo.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/com32/modules/meminfo.c b/com32/modules/meminfo.c index 00d0e14..a1abc36 100644 --- a/com32/modules/meminfo.c +++ b/com32/modules/meminfo.c @@ -44,9 +44,9 @@ static void dump_e820(void) uint32_t type; void *low_ed; - low_ed = lmalloc(sizeof ed); - if (!low_ed) - return; + low_ed = lmalloc(sizeof ed); + if (!low_ed) + return; memset(&ireg, 0, sizeof ireg); @@ -90,7 +90,7 @@ static void dump_e820(void) ireg.ebx.l = oreg.ebx.l; } while (ireg.ebx.l); - free(low_ed); + lfree(low_ed); } static void dump_legacy(void) diff --git a/com32/modules/vesainfo.c b/com32/modules/vesainfo.c index 86a4365..382bd14 100644 --- a/com32/modules/vesainfo.c +++ b/com32/modules/vesainfo.c @@ -79,7 +79,7 @@ static void print_modes(void) } exit: - free(vesa); + lfree(vesa); return; } -- 2.7.4