From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 30 Dec 2004 00:21:12 +0000 (+0000)
Subject: Avoid signed char subscript
X-Git-Tag: YAZ.2.0.30~10
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=6fad29ebb31777f3e01ad80f0c59a7a4dede9989;p=yaz-moved-to-github.git

Avoid signed char subscript
---

diff --git a/src/cclptree.c b/src/cclptree.c
index 920184a..49f088a 100644
--- a/src/cclptree.c
+++ b/src/cclptree.c
@@ -53,7 +53,7 @@
 /* CCL print rpn tree - infix notation
  * Europagate, 1995
  *
- * $Id: cclptree.c,v 1.3 2004-10-15 00:18:59 adam Exp $
+ * $Id: cclptree.c,v 1.4 2004-12-30 00:22:25 adam Exp $
  *
  * Old Europagate Log:
  *
@@ -145,7 +145,7 @@ void ccl_pr_tree_as_qrpn(struct ccl_rpn_node *rpn, FILE *fd_out, int indent)
             if (*cp == '!')
             {   
                 /* word order specified */
-                if (isdigit(cp[1]))
+                if (isdigit(((const unsigned char *) cp)[1]))
                     fprintf(fd_out, "@prox 0 %s 1 2 known 2", cp+1);
                 else
                     fprintf(fd_out, "@prox 0 1 1 2 known 2");
@@ -153,7 +153,7 @@ void ccl_pr_tree_as_qrpn(struct ccl_rpn_node *rpn, FILE *fd_out, int indent)
             else if (*cp == '%')
             {
                 /* word order not specified */
-                if (isdigit(cp[1]))
+                if (isdigit(((const unsigned char *) cp)[1]))
                     fprintf(fd_out, "@prox 0 %s 0 2 known 2", cp+1);
                 else
                     fprintf(fd_out, "@prox 0 1 0 2 known 2");
@@ -195,7 +195,7 @@ static void ccl_pquery_complex (WRBUF w, struct ccl_rpn_node *p)
             if (*cp == '!')
             {   
                 /* word order specified */
-                if (isdigit(cp[1]))
+                if (isdigit(((const unsigned char *) cp)[1]))
                     wrbuf_printf(w, "@prox 0 %s 1 2 k 2 ", cp+1);
                 else
                     wrbuf_printf(w, "@prox 0 1 1 2 k 2 ");
@@ -203,7 +203,7 @@ static void ccl_pquery_complex (WRBUF w, struct ccl_rpn_node *p)
             else if (*cp == '%')
             {
                 /* word order not specified */
-                if (isdigit(cp[1]))
+                if (isdigit(((const unsigned char *) cp)[1]))
                     wrbuf_printf(w, "@prox 0 %s 0 2 k 2 ", cp+1);
                 else
                     wrbuf_printf(w, "@prox 0 1 0 2 k 2 ");
diff --git a/src/pquery.c b/src/pquery.c
index e80ed88..289e368 100644
--- a/src/pquery.c
+++ b/src/pquery.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2004, Index Data.
  * See the file LICENSE for details.
  *
- * $Id: pquery.c,v 1.3 2004-11-17 00:17:17 adam Exp $
+ * $Id: pquery.c,v 1.4 2004-12-30 00:21:12 adam Exp $
  */
 /**
  * \file pquery.c
@@ -80,7 +80,7 @@ static int query_token (struct yaz_pqf_parser *li)
     }
     li->lex_buf = *qptr;
    
-    if (**qptr == li->escape_char && isdigit ((*qptr)[1]))
+    if (**qptr == li->escape_char && isdigit (((const unsigned char *) *qptr)[1]))
     {
 	++(li->lex_len);
 	++(*qptr);