Code updates which makes things compile as C++. Mostly type casts were

[yaz-moved-to-github.git] / src / cclqual.c

diff --git a/src/cclqual.c b/src/cclqual.c
index 67ef7fa..f771013 100644 (file)
--- a/src/cclqual.c
+++ b/src/cclqual.c
@@ -48,7 +48,7 @@
 /* CCL qualifiers
  * Europagate, 1995
  *
- * $Id: cclqual.c,v 1.10 2007-05-01 12:22:11 adam Exp $
+ * $Id: cclqual.c,v 1.12 2007-05-06 20:12:20 adam Exp $
  *
  * Old Europagate Log:
  *
@@ -137,7 +137,7 @@ void ccl_qual_add_special_ar(CCL_bibset bibset, const char *n,
             int i;
             for (i = 0; p->values[i]; i++)
                 xfree((char *) p->values[i]);
-            xfree(p->values);
+            xfree((char **)p->values);
         }
     }
     else
@@ -153,10 +153,10 @@ void ccl_qual_add_special_ar(CCL_bibset bibset, const char *n,
 void ccl_qual_add_special(CCL_bibset bibset, const char *n, const char *cp)
 {
     size_t no = 2;
-    char **vlist = xmalloc(no * sizeof(*vlist));
+    char **vlist = (char **) xmalloc(no * sizeof(*vlist));
     yaz_tok_cfg_t yt = yaz_tok_cfg_create();
     int t;
-    int i = 0;
+    size_t i = 0;
     
     yaz_tok_parse_t tp = yaz_tok_parse_buf(yt, cp);
     
@@ -166,7 +166,7 @@ void ccl_qual_add_special(CCL_bibset bibset, const char *n, const char *cp)
     while (t == YAZ_TOK_STRING)
     {
         if (i >= no-1)
-            vlist = xrealloc(vlist, (no = no * 2) * sizeof(*vlist));
+            vlist = (char **) xrealloc(vlist, (no = no * 2) * sizeof(*vlist));
         vlist[i++] = xstrdup(yaz_tok_parse_string(tp));
         t = yaz_tok_move(tp); 
     }
@@ -323,7 +323,7 @@ void ccl_qual_rm(CCL_bibset *b)
             int i;
             for (i = 0; sp->values[i]; i++)
                 xfree((char*) sp->values[i]);
-            xfree(sp->values);
+            xfree((char **)sp->values);
         }
         xfree(sp);
     }