/[qemacs]/qemacs/util.c
ViewVC logotype

Diff of /qemacs/util.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.11 by chqrlie, Fri May 13 09:56:44 2005 UTC revision 1.12 by chqrlie, Fri Jul 8 09:30:44 2005 UTC
# Line 468  const char *keystr[] = { Line 468  const char *keystr[] = {
468      "f16", "f17", "f18", "f19", "f20",      "f16", "f17", "f18", "f19", "f20",
469  };  };
470    
471  int compose_keys(int *keys, int *nb_keys)  int compose_keys(unsigned int *keys, int *nb_keys)
472  {  {
473      int *keyp;      unsigned int *keyp;
474    
475      if (*nb_keys < 2)      if (*nb_keys < 2)
476          return 0;          return 0;
# Line 680  static ColorDef *css_lookup_color(ColorD Line 680  static ColorDef *css_lookup_color(ColorD
680  int css_define_color(const char *name, const char *value)  int css_define_color(const char *name, const char *value)
681  {  {
682      ColorDef *def;      ColorDef *def;
683      int color;      QEColor color;
684    
685      /* Check color validity */      /* Check color validity */
686      if (css_get_color(&color, value))      if (css_get_color(&color, value))
# Line 716  int css_define_color(const char *name, c Line 716  int css_define_color(const char *name, c
716  }  }
717    
718  /* XXX: make HTML parsing optional ? */  /* XXX: make HTML parsing optional ? */
719  int css_get_color(int *color_ptr, const char *p)  int css_get_color(QEColor *color_ptr, const char *p)
720  {  {
721      const ColorDef *def;      const ColorDef *def;
722      int len, v, i, n;      int len, v, i, n;
# Line 980  int qmemcat(QString *q, const unsigned c Line 980  int qmemcat(QString *q, const unsigned c
980   */   */
981  int qstrcat(QString *q, const char *str)  int qstrcat(QString *q, const char *str)
982  {  {
983          return qmemcat(q, str, strlen(str));          return qmemcat(q, (unsigned char *)str, strlen(str));
984  }  }
985    
986  /* XXX: we use a fixed size buffer */  /* XXX: we use a fixed size buffer */
# Line 995  int qprintf(QString *q, const char *fmt, Line 995  int qprintf(QString *q, const char *fmt,
995      /* avoid problems for non C99 snprintf() which can return -1 if overflow */      /* avoid problems for non C99 snprintf() which can return -1 if overflow */
996          if (len < 0)          if (len < 0)
997                  len = strlen(buf);                  len = strlen(buf);
998          ret = qmemcat(q, buf, len);          ret = qmemcat(q, (unsigned char *)buf, len);
999          va_end(ap);          va_end(ap);
1000          return ret;          return ret;
1001  }  }

Legend:
Removed from v.1.11  
changed lines
  Added in v.1.12

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26