[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103128: Merge: xstrcasecmp: conform
|
From: |
Paul Eggert |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103128: Merge: xstrcasecmp: conform to C89 pointer rules |
|
Date: |
Sat, 05 Feb 2011 02:22:19 -0800 |
|
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103128 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2011-02-05 02:22:19 -0800
message:
Merge: xstrcasecmp: conform to C89 pointer rules
modified:
src/ChangeLog
src/dispextern.h
src/font.c
src/fontset.c
src/ftfont.c
src/image.c
src/process.c
src/xfaces.c
src/xfont.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-02-05 09:57:53 +0000
+++ b/src/ChangeLog 2011-02-05 10:20:15 +0000
@@ -1,5 +1,10 @@
2011-02-05 Paul Eggert <address@hidden>
+ xstrcasecmp: conform to C89 pointer rules
+ * xfaces.c (xstrcasecmp): Change args from const unsigned char *
+ to const char *, since they're usually low-level C strings, and
+ this stays compatible with C89 pointer rules. All callers changed.
+
* charset.c: conform to C89 pointer rules
(define_charset_internal): Switch between char * and unsigned char *.
=== modified file 'src/dispextern.h'
--- a/src/dispextern.h 2011-01-26 08:36:39 +0000
+++ b/src/dispextern.h 2011-02-05 10:20:15 +0000
@@ -3151,7 +3151,7 @@
int *);
int ascii_face_of_lisp_face (struct frame *, int);
void prepare_face_for_display (struct frame *, struct face *);
-int xstrcasecmp (const unsigned char *, const unsigned char *);
+int xstrcasecmp (const char *, const char *);
int lookup_named_face (struct frame *, Lisp_Object, int);
int lookup_basic_face (struct frame *, int);
int smaller_face (struct frame *, int, int);
@@ -3361,4 +3361,3 @@
#endif /* HAVE_WINDOW_SYSTEM */
#endif /* not DISPEXTERN_H_INCLUDED */
-
=== modified file 'src/font.c'
--- a/src/font.c 2011-01-31 23:54:50 +0000
+++ b/src/font.c 2011-02-05 10:20:15 +0000
@@ -315,7 +315,7 @@
if (SYMBOLP (val))
{
- unsigned char *s;
+ char *s;
Lisp_Object args[2], elt;
/* At first try exact match. */
@@ -325,12 +325,12 @@
return ((XINT (AREF (AREF (table, i), 0)) << 8)
| (i << 4) | (j - 1));
/* Try also with case-folding match. */
- s = SDATA (SYMBOL_NAME (val));
+ s = SSDATA (SYMBOL_NAME (val));
for (i = 0; i < len; i++)
for (j = 1; j < ASIZE (AREF (table, i)); j++)
{
elt = AREF (AREF (table, i), j);
- if (xstrcasecmp (s, SDATA (SYMBOL_NAME (elt))) == 0)
+ if (xstrcasecmp (s, SSDATA (SYMBOL_NAME (elt))) == 0)
return ((XINT (AREF (AREF (table, i), 0)) << 8)
| (i << 4) | (j - 1));
}
=== modified file 'src/fontset.c'
--- a/src/fontset.c 2011-01-26 08:36:39 +0000
+++ b/src/fontset.c 2011-02-05 10:20:15 +0000
@@ -1166,7 +1166,7 @@
this_name = FONTSET_NAME (fontset);
if (name_pattern == 1
? fast_string_match_ignore_case (name, this_name) >= 0
- : !xstrcasecmp (SDATA (name), SDATA (this_name)))
+ : !xstrcasecmp (SSDATA (name), SSDATA (this_name)))
return i;
}
return -1;
=== modified file 'src/ftfont.c'
--- a/src/ftfont.c 2011-01-28 12:31:34 +0000
+++ b/src/ftfont.c 2011-02-05 10:20:15 +0000
@@ -1022,12 +1022,12 @@
if (! NILP (adstyle)
&& (NILP (this_adstyle)
- || xstrcasecmp (SDATA (SYMBOL_NAME (adstyle)),
- SDATA (SYMBOL_NAME (this_adstyle))) != 0))
+ || xstrcasecmp (SSDATA (SYMBOL_NAME (adstyle)),
+ SSDATA (SYMBOL_NAME (this_adstyle))) != 0))
continue;
if (langname
&& ! NILP (this_adstyle)
- && xstrcasecmp (langname, SDATA (SYMBOL_NAME (this_adstyle))))
+ && xstrcasecmp (langname, SSDATA (SYMBOL_NAME (this_adstyle))))
continue;
}
entity = ftfont_pattern_entity (fontset->fonts[i],
=== modified file 'src/image.c'
--- a/src/image.c 2011-02-01 19:46:21 +0000
+++ b/src/image.c 2011-02-05 10:20:15 +0000
@@ -3906,7 +3906,7 @@
while (num_colors-- > 0)
{
- unsigned char *color, *max_color;
+ char *color, *max_color;
int key, next_key, max_key = 0;
Lisp_Object symbol_color = Qnil, color_val;
XColor cdef;
@@ -3958,7 +3958,7 @@
if (CONSP (specified_color) && STRINGP (XCDR (specified_color)))
{
- if (xstrcasecmp (SDATA (XCDR (specified_color)), "None") == 0)
+ if (xstrcasecmp (SSDATA (XCDR (specified_color)), "None") == 0)
color_val = Qt;
else if (x_defined_color (f, SDATA (XCDR (specified_color)),
&cdef, 0))
=== modified file 'src/process.c'
--- a/src/process.c 2011-01-30 22:17:44 +0000
+++ b/src/process.c 2011-02-05 10:20:15 +0000
@@ -6168,10 +6168,10 @@
;
else
{
- unsigned char *name;
+ char *name;
CHECK_SYMBOL (sigcode);
- name = SDATA (SYMBOL_NAME (sigcode));
+ name = SSDATA (SYMBOL_NAME (sigcode));
if (!strncmp (name, "SIG", 3) || !strncmp (name, "sig", 3))
name += 3;
=== modified file 'src/xfaces.c'
--- a/src/xfaces.c 2011-01-30 22:17:44 +0000
+++ b/src/xfaces.c 2011-02-05 10:20:15 +0000
@@ -716,12 +716,14 @@
are in ISO8859-1. */
int
-xstrcasecmp (const unsigned char *s1, const unsigned char *s2)
+xstrcasecmp (const char *s1, const char *s2)
{
while (*s1 && *s2)
{
- unsigned char c1 = tolower (*s1);
- unsigned char c2 = tolower (*s2);
+ unsigned char b1 = *s1;
+ unsigned char b2 = *s2;
+ unsigned char c1 = tolower (b1);
+ unsigned char c2 = tolower (b2);
if (c1 != c2)
return c1 < c2 ? -1 : 1;
++s1, ++s2;
@@ -3466,13 +3468,13 @@
xassert (STRINGP (value));
- if (xstrcasecmp (SDATA (value), "on") == 0
- || xstrcasecmp (SDATA (value), "true") == 0)
+ if (xstrcasecmp (SSDATA (value), "on") == 0
+ || xstrcasecmp (SSDATA (value), "true") == 0)
result = Qt;
- else if (xstrcasecmp (SDATA (value), "off") == 0
- || xstrcasecmp (SDATA (value), "false") == 0)
+ else if (xstrcasecmp (SSDATA (value), "off") == 0
+ || xstrcasecmp (SSDATA (value), "false") == 0)
result = Qnil;
- else if (xstrcasecmp (SDATA (value), "unspecified") == 0)
+ else if (xstrcasecmp (SSDATA (value), "unspecified") == 0)
result = Qunspecified;
else if (signal_p)
signal_error ("Invalid face attribute value from X resource", value);
@@ -3491,7 +3493,7 @@
CHECK_SYMBOL (attr);
CHECK_STRING (value);
- if (xstrcasecmp (SDATA (value), "unspecified") == 0)
+ if (xstrcasecmp (SSDATA (value), "unspecified") == 0)
value = Qunspecified;
else if (EQ (attr, QCheight))
{
@@ -4051,10 +4053,10 @@
{
xassert (lface_fully_specified_p (lface1)
&& lface_fully_specified_p (lface2));
- return (xstrcasecmp (SDATA (lface1[LFACE_FAMILY_INDEX]),
- SDATA (lface2[LFACE_FAMILY_INDEX])) == 0
- && xstrcasecmp (SDATA (lface1[LFACE_FOUNDRY_INDEX]),
- SDATA (lface2[LFACE_FOUNDRY_INDEX])) == 0
+ return (xstrcasecmp (SSDATA (lface1[LFACE_FAMILY_INDEX]),
+ SSDATA (lface2[LFACE_FAMILY_INDEX])) == 0
+ && xstrcasecmp (SSDATA (lface1[LFACE_FOUNDRY_INDEX]),
+ SSDATA (lface2[LFACE_FOUNDRY_INDEX])) == 0
&& EQ (lface1[LFACE_HEIGHT_INDEX], lface2[LFACE_HEIGHT_INDEX])
&& EQ (lface1[LFACE_SWIDTH_INDEX], lface2[LFACE_SWIDTH_INDEX])
&& EQ (lface1[LFACE_WEIGHT_INDEX], lface2[LFACE_WEIGHT_INDEX])
@@ -4063,8 +4065,8 @@
&& (EQ (lface1[LFACE_FONTSET_INDEX], lface2[LFACE_FONTSET_INDEX])
|| (STRINGP (lface1[LFACE_FONTSET_INDEX])
&& STRINGP (lface2[LFACE_FONTSET_INDEX])
- && ! xstrcasecmp (SDATA (lface1[LFACE_FONTSET_INDEX]),
- SDATA (lface2[LFACE_FONTSET_INDEX]))))
+ && ! xstrcasecmp (SSDATA (lface1[LFACE_FONTSET_INDEX]),
+ SSDATA (lface2[LFACE_FONTSET_INDEX]))))
);
}
=== modified file 'src/xfont.c'
--- a/src/xfont.c 2011-01-25 04:08:28 +0000
+++ b/src/xfont.c 2011-02-05 10:20:15 +0000
@@ -164,8 +164,8 @@
static int
compare_font_names (const void *name1, const void *name2)
{
- return xstrcasecmp (*(const unsigned char **) name1,
- *(const unsigned char **) name2);
+ return xstrcasecmp (*(const char **) name1,
+ *(const char **) name2);
}
/* Decode XLFD as iso-8859-1 into OUTPUT, and return the byte length
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103128: Merge: xstrcasecmp: conform to C89 pointer rules,
Paul Eggert <=