Fix "subscript has type char" warnings...

pull/193/head
Michael R Sweet 20 years ago
parent 0591ee2e19
commit a2682a2ee2
  1. 6
      mxml.h
  2. 20
      mxmldoc.c

@ -1,5 +1,5 @@
/* /*
* "$Id: mxml.h,v 1.23 2004/10/28 02:58:00 mike Exp $" * "$Id: mxml.h,v 1.24 2004/10/31 15:32:14 mike Exp $"
* *
* Header file for Mini-XML, a small XML-like file parsing library. * Header file for Mini-XML, a small XML-like file parsing library.
* *
@ -139,7 +139,7 @@ typedef struct mxml_index_s /**** An XML node index. ****/
typedef int (*mxml_custom_load_cb_t)(mxml_node_t *, const char *); typedef int (*mxml_custom_load_cb_t)(mxml_node_t *, const char *);
/**** Custom data load callback function ****/ /**** Custom data load callback function ****/
typedef const char *(*mxml_custom_save_cb_t)(mxml_node_t *); typedef char *(*mxml_custom_save_cb_t)(mxml_node_t *);
/**** Custom data save callback function ****/ /**** Custom data save callback function ****/
@ -250,5 +250,5 @@ extern mxml_type_t mxml_real_cb(mxml_node_t *node);
/* /*
* End of "$Id: mxml.h,v 1.23 2004/10/28 02:58:00 mike Exp $". * End of "$Id: mxml.h,v 1.24 2004/10/31 15:32:14 mike Exp $".
*/ */

@ -1,5 +1,5 @@
/* /*
* "$Id: mxmldoc.c,v 1.38 2004/10/28 01:07:00 mike Exp $" * "$Id: mxmldoc.c,v 1.39 2004/10/31 15:32:14 mike Exp $"
* *
* Documentation generator using Mini-XML, a small XML-like file parsing * Documentation generator using Mini-XML, a small XML-like file parsing
* library. * library.
@ -1066,7 +1066,7 @@ scan_file(const char *filename, /* I - Filename */
if (ch == '/' && bufptr > buffer && bufptr[-1] == '*') if (ch == '/' && bufptr > buffer && bufptr[-1] == '*')
{ {
while (bufptr > buffer && while (bufptr > buffer &&
(bufptr[-1] == '*' || isspace(bufptr[-1]))) (bufptr[-1] == '*' || isspace(bufptr[-1] & 255)))
bufptr --; bufptr --;
*bufptr = '\0'; *bufptr = '\0';
@ -1523,7 +1523,7 @@ scan_file(const char *filename, /* I - Filename */
buffer); buffer);
} }
} }
else if (enumeration && !isdigit(buffer[0])) else if (enumeration && !isdigit(buffer[0] & 255))
{ {
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "Constant: <<<< %s >>>\n", buffer); fprintf(stderr, "Constant: <<<< %s >>>\n", buffer);
@ -1697,13 +1697,13 @@ update_comment(mxml_node_t *parent, /* I - Parent node */
if (*ptr == '\'') if (*ptr == '\'')
{ {
ptr ++; ptr ++;
while (isspace(*ptr)) while (isspace(*ptr & 255))
ptr ++; ptr ++;
if (*ptr == '-') if (*ptr == '-')
ptr ++; ptr ++;
while (isspace(*ptr)) while (isspace(*ptr & 255))
ptr ++; ptr ++;
safe_strcpy(comment->value.text.string, ptr); safe_strcpy(comment->value.text.string, ptr);
@ -1723,13 +1723,13 @@ update_comment(mxml_node_t *parent, /* I - Parent node */
if (!strcmp(parent->value.element.name, "argument")) if (!strcmp(parent->value.element.name, "argument"))
mxmlElementSetAttr(parent, "direction", comment->value.text.string); mxmlElementSetAttr(parent, "direction", comment->value.text.string);
while (isspace(*ptr)) while (isspace(*ptr & 255))
ptr ++; ptr ++;
if (*ptr == '-') if (*ptr == '-')
ptr ++; ptr ++;
while (isspace(*ptr)) while (isspace(*ptr & 255))
ptr ++; ptr ++;
safe_strcpy(comment->value.text.string, ptr); safe_strcpy(comment->value.text.string, ptr);
@ -1740,7 +1740,7 @@ update_comment(mxml_node_t *parent, /* I - Parent node */
*/ */
for (ptr = comment->value.text.string; *ptr == '*'; ptr ++); for (ptr = comment->value.text.string; *ptr == '*'; ptr ++);
for (; isspace(*ptr); ptr ++); for (; isspace(*ptr & 255); ptr ++);
if (ptr > comment->value.text.string) if (ptr > comment->value.text.string)
safe_strcpy(comment->value.text.string, ptr); safe_strcpy(comment->value.text.string, ptr);
@ -1748,7 +1748,7 @@ update_comment(mxml_node_t *parent, /* I - Parent node */
ptr > comment->value.text.string && *ptr == '*'; ptr > comment->value.text.string && *ptr == '*';
ptr --) ptr --)
*ptr = '\0'; *ptr = '\0';
for (; ptr > comment->value.text.string && isspace(*ptr); ptr --) for (; ptr > comment->value.text.string && isspace(*ptr & 255); ptr --)
*ptr = '\0'; *ptr = '\0';
#ifdef DEBUG #ifdef DEBUG
@ -2745,5 +2745,5 @@ ws_cb(mxml_node_t *node, /* I - Element node */
/* /*
* End of "$Id: mxmldoc.c,v 1.38 2004/10/28 01:07:00 mike Exp $". * End of "$Id: mxmldoc.c,v 1.39 2004/10/31 15:32:14 mike Exp $".
*/ */

Loading…
Cancel
Save