Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge remote-tracking branch 'hdt/lua'
  • Loading branch information
H. Peter Anvin committed Feb 21, 2011
2 parents 102b58a + 0a8f78b commit 1207d0f
Show file tree
Hide file tree
Showing 34 changed files with 566 additions and 317 deletions.
4 changes: 4 additions & 0 deletions NEWS
Expand Up @@ -21,6 +21,10 @@ Changes in 4.04:
* Fix booting on non-partitioned devices.
* MBR, isohybrid: Workaround for a BIOS issue on Acer
Travelmate and possibly other machines.
* COM32: Adding ACPI parsing libary
* HDT: Release 0.4.1 to support ACPI parsing,
improved mutli-core/cpu reporting
* LUA: Updating to 5.1.4-2

Changes in 4.03:
* Don't hang if no configuration file is found.
Expand Down
7 changes: 7 additions & 0 deletions com32/include/ctype.h
Expand Up @@ -114,4 +114,11 @@ __ctype_inline int tolower(int __c)
return isupper(__c) ? _tolower(__c) : __c;
}

__ctype_inline char *skipspace(const char *p)
{
while (isspace((unsigned char)*p))
p++;
return (char *)p;
}

#endif /* _CTYPE_H */
10 changes: 1 addition & 9 deletions com32/lib/pci/scan.c
Expand Up @@ -39,6 +39,7 @@
#include <sys/pci.h>
#include <com32.h>
#include <stdbool.h>
#include <ctype.h>
#include <syslinux/zio.h>

#ifdef DEBUG
Expand All @@ -49,15 +50,6 @@

#define MAX_LINE 512

/* searching the next char that is not a space */
static char *skipspace(char *p)
{
while (*p && *p <= ' ')
p++;

return p;
}

/* removing any \n found in a string */
static void remove_eol(char *string)
{
Expand Down
7 changes: 0 additions & 7 deletions com32/lib/vsscanf.c
Expand Up @@ -47,13 +47,6 @@ enum bail {
bail_err /* Conversion mismatch */
};

static const char *skipspace(const char *p)
{
while (isspace((unsigned char)*p))
p++;
return p;
}

int vsscanf(const char *buffer, const char *format, va_list ap)
{
const char *p = format;
Expand Down

0 comments on commit 1207d0f

Please sign in to comment.