You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2002/06/23 08:13:18 UTC

cvs commit: httpd-2.0/modules/metadata mod_mime_magic.c

wrowe       2002/06/22 23:13:18

  Modified:    modules/metadata mod_mime_magic.c
  Log:
    cleanup uses of apr_ischar() macros (no cast required)
  
  Revision  Changes    Path
  1.58      +5 -5      httpd-2.0/modules/metadata/mod_mime_magic.c
  
  Index: mod_mime_magic.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_mime_magic.c,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- mod_mime_magic.c	17 May 2002 11:33:10 -0000	1.57
  +++ mod_mime_magic.c	23 Jun 2002 06:13:17 -0000	1.58
  @@ -945,7 +945,7 @@
       magic_rsl_puts(r, MIME_BINARY_UNKNOWN);
   }
   
  -#define    EATAB {while (apr_isspace((unsigned char) *l))  ++l;}
  +#define    EATAB {while (apr_isspace(*l))  ++l;}
   
   /*
    * apprentice - load configuration from the magic file r
  @@ -1279,7 +1279,7 @@
   	}
   	/* FALL THROUGH */
       default:
  -	if (*l == 'x' && apr_isspace((unsigned char) l[1])) {
  +	if (*l == 'x' && apr_isspace(l[1])) {
   	    m->reln = *l;
   	    ++l;
   	    goto GetDesc;	/* Bill The Cat */
  @@ -1351,7 +1351,7 @@
       register int val;
   
       while ((c = *s++) != '\0') {
  -	if (apr_isspace((unsigned char) c))
  +	if (apr_isspace(c))
   	    break;
   	if (p >= pmax) {
   	    ap_log_error(APLOG_MARK, APLOG_ERR, 0, serv,
  @@ -1454,7 +1454,7 @@
   /* Single hex char to int; -1 if not a hex char. */
   static int hextoint(int c)
   {
  -    if (apr_isdigit((unsigned char) c))
  +    if (apr_isdigit(c))
   	return c - '0';
       if ((c >= 'a') && (c <= 'f'))
   	return c + 10 - 'a';
  @@ -2257,7 +2257,7 @@
    * Darwin.
    */
   
  -#define    isodigit(c)    ( ((c) >= '0') && ((c) <= '7') )
  +#define isodigit(c) (((unsigned char)(c) >= '0') && ((unsigned char)(c) <= '7'))
   
   /*
    * Return 0 if the checksum is bad (i.e., probably not a tar archive), 1 for