Skip to content

Commit

Permalink
com32: single instance of skipspace()
Browse files Browse the repository at this point in the history
no need to keep several versions of it.
  • Loading branch information
ErwanAliasr1 committed Feb 7, 2011
1 parent c030de4 commit 6d0cfd4
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 50 deletions.
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
28 changes: 10 additions & 18 deletions com32/lua/src/pci.c
@@ -1,6 +1,7 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>

#define lpcilib_c /* Define the library */

Expand All @@ -9,6 +10,15 @@
#include "lualib.h"
#include <sys/pci.h>

/* removing any \n found in a string */
static void remove_eol(char *string)
{
int j = strlen(string);
int i = 0;
for (i = 0; i < j; i++)
if (string[i] == '\n')
string[i] = 0;
}

static int pci_getinfo(lua_State *L)
{
Expand Down Expand Up @@ -59,24 +69,6 @@ static int pci_getinfo(lua_State *L)
return 1;
}

/* 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)
{
int j = strlen(string);
int i = 0;
for(i = 0; i < j; i++) if(string[i] == '\n') string[i] = 0;
}


/* Try to match any pci device to the appropriate kernel module */
/* it uses the modules.pcimap from the boot device*/
static int pci_getidlist(lua_State *L)
Expand Down
9 changes: 1 addition & 8 deletions com32/menu/readconfig.c
Expand Up @@ -15,6 +15,7 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <minmax.h>
#include <alloca.h>
#include <inttypes.h>
Expand Down Expand Up @@ -92,14 +93,6 @@ static struct menu *find_menu(const char *label)

#define MAX_LINE 4096

static char *skipspace(char *p)
{
while (*p && my_isspace(*p))
p++;

return p;
}

/* Strip ^ from a string, returning a new reference to the same refstring
if none present */
static const char *strip_caret(const char *str)
Expand Down
9 changes: 1 addition & 8 deletions com32/modules/ethersel.c
Expand Up @@ -30,6 +30,7 @@

#include <inttypes.h>
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
#include <console.h>
Expand All @@ -44,14 +45,6 @@
# define dprintf(...) ((void)0)
#endif

static char *skipspace(char *p)
{
while (*p && *p <= ' ')
p++;

return p;
}

#define MAX_LINE 512

/* Check to see if we are at a certain keyword (case insensitive) */
Expand Down

0 comments on commit 6d0cfd4

Please sign in to comment.