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
Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -136,7 +136,7 @@ grub_serial_find (char *name)
#ifndef GRUB_MACHINE_EMU
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],
0, 16));

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

@ -211,14 +211,6 @@ grub_video_get_named_color (const char *name,
return 0;
}
static __inline int
my_isxdigit (char c)
{
return ((c >= '0' && c <= '9')
|| (c >= 'a' && c <= 'f')
|| (c >= 'A' && c <= 'F'));
}
static int
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. */
int hexits = 0;
const char *end = s;
while (my_isxdigit (*end))
while (grub_isxdigit (*end))
{
end++;
hexits++;