vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/lib/posix_wrap/ctype.h (isxdigit): Use grub_isxdigit.

Browse source 
* include/grub/misc.h (grub_isxdigit): New function.
	* grub-core/video/colors.c (my_isxdigit): Removed. All users
	switched to grub_isxdigit.
	* grub-core/term/serial.c (grub_serial_find): Fix in case of port
	number starting with a letter.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-10-14 19:16:37 +02:00
parent a98f4a0808
commit 0eb8ffb1f5
5 changed files with 24 additions and 12 deletions
ChangeLog
grub-core
lib/posix_wrap
ctype.h
term
serial.c
video
colors.c
include/grub
misc.h

15
ChangeLog
View file

@ -1,3 +1,12 @@
2011-10-14 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/posix_wrap/ctype.h (isxdigit): Use grub_isxdigit.
* include/grub/misc.h (grub_isxdigit): New function.
* grub-core/video/colors.c (my_isxdigit): Removed. All users
switched to grub_isxdigit.
* grub-core/term/serial.c (grub_serial_find): Fix in case of port
number starting with a letter.
2011-10-09 Robert Millan <rmh@gnu.org> 2011-10-09 Robert Millan <rmh@gnu.org>
LVM support for FreeBSD and GNU/kFreeBSD. LVM support for FreeBSD and GNU/kFreeBSD.
@ -63,6 +72,12 @@
(grub_get_unaligned64): Likewise. (grub_get_unaligned64): Likewise.
* util/import_gcry.py (cryptolist): Add adler32. * util/import_gcry.py (cryptolist): Add adler32.
2011-10-05 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/Makefile.core.def: Eliminate rarely used emu_condition. This
in perspective decreases the complexity of build system and fixes
compilation right now.
2011-10-01 Ales Nesrsta <starous@volny.cz> 2011-10-01 Ales Nesrsta <starous@volny.cz>
* grub-core/bus/usb/uhci.c: Changes made by Rock Cui - thanks! * grub-core/bus/usb/uhci.c: Changes made by Rock Cui - thanks!

3
grub-core/lib/posix_wrap/ctype.h
View file

@ -54,8 +54,7 @@ isupper (int c)
static inline int static inline int
isxdigit (int c) isxdigit (int c)
{ {
return (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F') return grub_isxdigit (c);
|| (c >= '0' && c <= '9');
} }
static inline int static inline int

2
grub-core/term/serial.c
View file

@ -136,7 +136,7 @@ grub_serial_find (char *name)
#ifndef GRUB_MACHINE_EMU #ifndef GRUB_MACHINE_EMU
if (!port && grub_memcmp (name, "port", sizeof ("port") - 1) == 0 if (!port && grub_memcmp (name, "port", sizeof ("port") - 1) == 0
&& grub_isdigit (name [sizeof ("port") - 1])) && grub_isxdigit (name [sizeof ("port") - 1]))
{ {
name = grub_serial_ns8250_add_port (grub_strtoul (&name[sizeof ("port") - 1], name = grub_serial_ns8250_add_port (grub_strtoul (&name[sizeof ("port") - 1],
0, 16)); 0, 16));

10
grub-core/video/colors.c
View file

@ -211,14 +211,6 @@ grub_video_get_named_color (const char *name,
return 0; return 0;
} }
static __inline int
my_isxdigit (char c)
{
return ((c >= '0' && c <= '9')
|| (c >= 'a' && c <= 'f')
|| (c >= 'A' && c <= 'F'));
}
static int static int
parse_hex_color_component (const char *s, unsigned start, unsigned end) parse_hex_color_component (const char *s, unsigned start, unsigned end)
{ {
@ -267,7 +259,7 @@ grub_video_parse_color (const char *s, grub_video_rgba_color_t *color)
/* Count the hexits to determine the format. */ /* Count the hexits to determine the format. */
int hexits = 0; int hexits = 0;
const char *end = s; const char *end = s;
while (my_isxdigit (*end)) while (grub_isxdigit (*end))
{ {
end++; end++;
hexits++; hexits++;

6
include/grub/misc.h
View file

@ -136,6 +136,12 @@ grub_isdigit (int c)
return (c >= '0' && c <= '9'); return (c >= '0' && c <= '9');
} }
static inline int
grub_isxdigit (int c)
{
return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F');
}
static inline int static inline int
grub_isalnum (int c) grub_isalnum (int c)
{ {