fixing compiler warnings

* unfortunately, strtol() wants a char** in its second arg, not a const char**,
  which transitively changes the entire declaration
* if namelen is being used as an array index, it should better be unsigned

CVS patchset: 7355
CVS date: 2005/01/16 18:47:19

2 files changed, 8 insertions, 6 deletions

diff --git a/src/xine-utils/xmllexer.c b/src/xine-utils/xmllexer.c
index 97a23b41e..0319964d7 100644
--- a/src/xine-utils/xmllexer.c
+++ b/src/xine-utils/xmllexer.c
@@ -17,7 +17,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- *  $Id: xmllexer.c,v 1.9 2005/01/16 17:51:04 dsalt Exp $
+ *  $Id: xmllexer.c,v 1.10 2005/01/16 18:47:19 mroi Exp $
  *
  */
 
@@ -415,7 +415,9 @@ int lexer_get_token(char * tok, int tok_size) {
 }
 
 static struct {
-  char code, namelen, name[6];
+  char code;
+  unsigned char namelen;
+  char name[6];
 } lexer_entities[] = {
   { '"',  4, "quot" },
   { '&',  3, "amp" },
@@ -425,7 +427,7 @@ static struct {
   { 0 }
 };
 
-char *lexer_decode_entities (const char *tok)
+char *lexer_decode_entities (char *tok)
 {
   char *buf = xine_xmalloc (strlen (tok) + 1);
   char *bp = buf;
@@ -438,7 +440,7 @@ char *lexer_decode_entities (const char *tok)
     else
     {
       /* parse the character entity (on failure, treat it as literal text) */
-      const char *tp = tok;
+      char *tp = tok;
       long i;
 
       for (i = 0; lexer_entities[i].code; ++i)
diff --git a/src/xine-utils/xmllexer.h b/src/xine-utils/xmllexer.h
index d142c3d0f..77c28c631 100644
--- a/src/xine-utils/xmllexer.h
+++ b/src/xine-utils/xmllexer.h
@@ -17,7 +17,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xmllexer.h,v 1.4 2005/01/16 17:51:04 dsalt Exp $
+ * $Id: xmllexer.h,v 1.5 2005/01/16 18:47:19 mroi Exp $
  *
  */
 
@@ -50,6 +50,6 @@
 /* public functions */
 void lexer_init(char * buf, int size);
 int lexer_get_token(char * tok, int tok_size);
-char *lexer_decode_entities (const char *tok);
+char *lexer_decode_entities (char *tok);
 
 #endif