[Qemacs-commit] Changes to qemacs/util.c

[Charlie Gordon]

Index: qemacs/util.c
diff -u qemacs/util.c:1.11 qemacs/util.c:1.12
--- qemacs/util.c:1.11  Fri May 13 09:56:44 2005
+++ qemacs/util.c       Fri Jul  8 09:30:44 2005
@@ -468,9 +468,9 @@
     "f16", "f17", "f18", "f19", "f20",
 };
 
-int compose_keys(int *keys, int *nb_keys)
+int compose_keys(unsigned int *keys, int *nb_keys)
 {
-    int *keyp;
+    unsigned int *keyp;
 
     if (*nb_keys < 2)
         return 0;
@@ -680,7 +680,7 @@
 int css_define_color(const char *name, const char *value)
 {
     ColorDef *def;
-    int color;
+    QEColor color;
 
     /* Check color validity */
     if (css_get_color(&color, value))
@@ -716,7 +716,7 @@
 }
 
 /* XXX: make HTML parsing optional ? */
-int css_get_color(int *color_ptr, const char *p)
+int css_get_color(QEColor *color_ptr, const char *p)
 {
     const ColorDef *def;
     int len, v, i, n;
@@ -980,7 +980,7 @@
  */
 int qstrcat(QString *q, const char *str)
 {
-        return qmemcat(q, str, strlen(str));
+        return qmemcat(q, (unsigned char *)str, strlen(str));
 }
 
 /* XXX: we use a fixed size buffer */
@@ -995,7 +995,7 @@
     /* avoid problems for non C99 snprintf() which can return -1 if overflow */
         if (len < 0)
                 len = strlen(buf);
-        ret = qmemcat(q, buf, len);
+        ret = qmemcat(q, (unsigned char *)buf, len);
         va_end(ap);
         return ret;
 }