[syslinux:master] memdisk & libcom32: Fix minor errors in previous commit

[syslinux-bot for Gene Cumm]

Commit-ID:  6d63144949d795320bb7f70a6156b46615864f5f
Gitweb:     http://syslinux.zytor.com/commit/6d63144949d795320bb7f70a6156b46615864f5f
Author:     Gene Cumm <gene.cumm at gmail.com>
AuthorDate: Tue, 8 Feb 2011 20:07:43 -0500
Committer:  Gene Cumm <gene.cumm at gmail.com>
CommitDate: Tue, 8 Feb 2011 20:07:43 -0500

memdisk & libcom32: Fix minor errors in previous commit



---
 com32/lib/syslinux/load_linux.c |   37 +------------------------------------
 memdisk/Makefile                |    2 +-
 memdisk/suffix_number.c         |    2 +-
 3 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/com32/lib/syslinux/load_linux.c b/com32/lib/syslinux/load_linux.c
index df79362..3ac6e5d 100644
--- a/com32/lib/syslinux/load_linux.c
+++ b/com32/lib/syslinux/load_linux.c
@@ -38,6 +38,7 @@
 #include <inttypes.h>
 #include <string.h>
 #include <minmax.h>
+#include <suffix_number.h>
 #include <syslinux/align.h>
 #include <syslinux/linux.h>
 #include <syslinux/bootrm.h>
@@ -96,42 +97,6 @@ struct linux_header {
 #define LOAD_HIGH	0x01
 #define CAN_USE_HEAP	0x80
 
-/* Get a value with a potential suffix (k/m/g/t/p/e) */
-static unsigned long long suffix_number(const char *str)
-{
-    char *ep;
-    unsigned long long v;
-    int shift;
-
-    v = strtoull(str, &ep, 0);
-    switch (*ep | 0x20) {
-    case 'k':
-	shift = 10;
-	break;
-    case 'm':
-	shift = 20;
-	break;
-    case 'g':
-	shift = 30;
-	break;
-    case 't':
-	shift = 40;
-	break;
-    case 'p':
-	shift = 50;
-	break;
-    case 'e':
-	shift = 60;
-	break;
-    default:
-	shift = 0;
-	break;
-    }
-    v <<= shift;
-
-    return v;
-}
-
 /* 
  * Find the last instance of a particular command line argument
  * (which should include the final =; do not use for boolean arguments)
diff --git a/memdisk/Makefile b/memdisk/Makefile
index ddb0553..ef0aca8 100644
--- a/memdisk/Makefile
+++ b/memdisk/Makefile
@@ -15,7 +15,7 @@ topdir = ..
 include $(topdir)/MCONFIG.embedded
 -include $(topdir)/version.mk
 
-INCLUDES = -I$(topdir)/com32/include -I$(topdir)/com32/libutil/include
+INCLUDES = -I$(topdir)/com32/include
 CFLAGS  += -D__MEMDISK__ -DDATE='"$(DATE)"'
 LDFLAGS  = $(GCCOPT) -g
 NASM     = nasm
diff --git a/memdisk/suffix_number.c b/memdisk/suffix_number.c
index dd26642..d01c5a3 100644
--- a/memdisk/suffix_number.c
+++ b/memdisk/suffix_number.c
@@ -1 +1 @@
-#include "../com32/libutil/suffix_number.c"
+#include "../com32/lib/suffix_number.c"