Changeset 2302

Timestamp:

Sep 21, 2008 9:11:49 PM (16 years ago)

Author:

bennylp

Message:

Ticket #639: Assertion in <ctype.h> functions with Visual Studio 2005 when handling non-ASCII characters

File:

• pjproject/trunk/pjlib/include/pj/ctype.h (modified) (12 diffs)

pjproject/trunk/pjlib/include/pj/ctype.h

@@ -45 +45 @@
  * @return      Non-zero value if either isalpha or isdigit is true for c.
  */
-PJ_INLINE(int) pj_isalnum(int c) { return isalnum(c); }
+PJ_INLINE(int) pj_isalnum(unsigned char c) { return isalnum(c); }
 
 /** 
@@ -54 +54 @@
  *              alphabetic character.
  */
-PJ_INLINE(int) pj_isalpha(int c) { return isalpha(c); }
+PJ_INLINE(int) pj_isalpha(unsigned char c) { return isalpha(c); }
 
 /** 
@@ -63 +63 @@
  *              an ASCII character.
  */
-PJ_INLINE(int) pj_isascii(int c) { return c<128 && c>=0; }
+PJ_INLINE(int) pj_isascii(unsigned char c) { return c<128 && c>=0; }
 
 /** 
@@ -72 +72 @@
  *              a decimal-digit character.
  */
-PJ_INLINE(int) pj_isdigit(int c) { return isdigit(c); }
+PJ_INLINE(int) pj_isdigit(unsigned char c) { return isdigit(c); }
 
 /** 
@@ -81 +81 @@
  *              a space character (0x09 - 0x0D or 0x20).
  */
-PJ_INLINE(int) pj_isspace(int c) { return isspace(c); }
+PJ_INLINE(int) pj_isspace(unsigned char c) { return isspace(c); }
 
 /** 
@@ -90 +90 @@
  *              a lowercase character.
  */
-PJ_INLINE(int) pj_islower(int c) { return islower(c); }
+PJ_INLINE(int) pj_islower(unsigned char c) { return islower(c); }
 
 
@@ -100 +100 @@
  *              a uppercase character.
  */
-PJ_INLINE(int) pj_isupper(int c) { return isupper(c); }
+PJ_INLINE(int) pj_isupper(unsigned char c) { return isupper(c); }
 
 /**
@@ -109 +109 @@
  *              tab ('\\t') character.
  */
-PJ_INLINE(int) pj_isblank(int c) { return isblank(c); }
+PJ_INLINE(int) pj_isblank(unsigned char c) { return isblank(c); }
 
 /**
@@ -116 +116 @@
  * @return      Lowercase character of c.
  */
-PJ_INLINE(int) pj_tolower(int c) { return tolower(c); }
+PJ_INLINE(int) pj_tolower(unsigned char c) { return tolower(c); }
 
 /**
@@ -123 +123 @@
  * @return      Uppercase character of c.
  */
-PJ_INLINE(int) pj_toupper(int c) { return toupper(c); }
+PJ_INLINE(int) pj_toupper(unsigned char c) { return toupper(c); }
 
 /**
@@ -132 +132 @@
  *              an hexadecimal digit character.
  */
-PJ_INLINE(int) pj_isxdigit(int c){ return isxdigit(c); }
+PJ_INLINE(int) pj_isxdigit(unsigned char c){ return isxdigit(c); }
 
 /**
@@ -157 +157 @@
  * @return      The integral value between 0 and 15.
  */
-PJ_INLINE(unsigned) pj_hex_digit_to_val(unsigned c)
+PJ_INLINE(unsigned) pj_hex_digit_to_val(unsigned char c)
 {
     if (c <= '9')