Attachment 10489 Details for Bug 11407 – Correct use of isdigit(), isalpha() etc.

[patch] Correct use of isdigit(), isalpha() etc.

uim-ctype.udif (text/plain), 2.82 KB, created by Christian Biere on 2007-06-28 13:02:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Biere

Created: 2007-06-28 13:02:28 UTC

Size: 2.82 KB

patch

obsolete

>--- gtk/compose.c	2006-12-22 05:32:35.000000000 +0100
>+++ gtk/compose.c	2007-06-28 20:00:20.000000000 +0200
>@@ -840,7 +844,7 @@
> 	char *p = buf;
> 	int n;
> 	char *args[2], *from, *to;
>-	while (isspace(*p)) {
>+	while (isspace((unsigned char)*p)) {
> 	    ++p;
> 	}
> 	if (iscomment(*p)) {
>@@ -883,7 +887,7 @@
>     char *p = line;
> 
>     while (argc < argsize) {
>-	while (isspace(*p)) {
>+	while (isspace((unsigned char)*p)) {
> 	    ++p;
> 	}
> 	if (*p == '\0') {
>--- uim/agent.c	2006-12-22 05:32:41.000000000 +0100
>+++ uim/agent.c	2007-06-28 19:56:03.000000000 +0200
>@@ -100,7 +100,7 @@
>   while (1) {
>     char buf[32];
>     fgets(buf, 32, stdin);
>-    if (isalpha((int)buf[0])) {
>+    if (isalpha((unsigned char)buf[0])) {
>       uim_press_key(ac->uc, buf[0], 0);
>     } else {
>       uim_press_key(ac->uc, UKey_Return, 0);
>--- uim/anthy.c	2006-12-22 05:32:42.000000000 +0100
>+++ uim/anthy.c	2007-06-28 19:55:11.000000000 +0200
>@@ -85,7 +85,7 @@
> 
>     len = strlen(str);
>     for (i = 0; str[i] != '\0'; i++) {
>-      if (isalpha(str[i]))
>+      if (isalpha((unsigned char)str[i]))
>         break;
>     }
> 
>--- uim/slib.c	2006-12-22 05:32:42.000000000 +0100
>+++ uim/slib.c	2007-06-28 19:54:01.000000000 +0200
>@@ -831,7 +831,7 @@
>   if ((start = strstr (buffer, key)))
>     {
>       for (end = &start[strlen (key)];
>-	   *end && isalnum ((int)*end);
>+	   *end && isalnum ((unsigned char)*end);
> 	   ++end);
>       j = end - start;
>       memmove (buffer, start, j);
>@@ -4064,7 +4064,7 @@
>   if (*p == '-')
>     p += 1;
>   adigit = 0;
>-  while (isdigit ((int)*p))
>+  while (isdigit ((unsigned char)*p))
>     {
>       p += 1;
>       adigit = 1;
>@@ -4072,7 +4072,7 @@
>   if (*p == '.')
>     {
>       p += 1;
>-      while (isdigit ((int)*p))
>+      while (isdigit ((unsigned char)*p))
> 	{
> 	  p += 1;
> 	  adigit = 1;
>@@ -4085,11 +4085,11 @@
>       p += 1;
>       if (*p == '-' || *p == '+')
> 	p += 1;
>-      if (!isdigit ((int)*p))
>+      if (!isdigit ((unsigned char)*p))
> 	goto a_symbol;
>       else
> 	p += 1;
>-      while (isdigit ((int)*p))
>+      while (isdigit ((unsigned char)*p))
> 	p += 1;
>     }
>   if (*p)
>--- uim/uim-func.c	2006-12-22 05:32:42.000000000 +0100
>+++ uim/uim-func.c	2007-06-28 19:57:54.000000000 +0200
>@@ -441,7 +441,7 @@
>      -- 2004-07-06 YamaKen
>   */
>   if (key_state == UMod_Shift) {
>-    buf[0] = toupper(buf[0]);
>+    buf[0] = toupper((unsigned char)buf[0]);
>   }
>   return uim_scm_make_str(buf);
> }
>--- uim/uim-scm.c	2006-12-22 05:32:42.000000000 +0100
>+++ uim/uim-scm.c	2007-06-28 19:52:39.000000000 +0200
>@@ -589,8 +589,8 @@
>   }
> 
>   if (verbose_level) {
>-    if (isdigit((int)verbose_level[0])) {
>-      if (isdigit((int)verbose_level[1]))
>+    if (isdigit((unsigned char)verbose_level[0])) {
>+      if (isdigit((unsigned char)verbose_level[1]))
> 	verbose_argv[2] = '9';	/* SIOD's max verbose level is 5 */
>       else
> 	verbose_argv[2] = verbose_level[0];

Actions: View | Splinter Review

Attachments on bug 11407: 10489

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.