Attachment 6157 Details for Bug 7097 – Patch 2nd try

[patch] Patch 2nd try

bug_7097_strcasecmp.diff (text/plain), 4.17 KB, created by Tilman Sauerbeck on 2006-07-07 10:43:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tilman Sauerbeck

Created: 2006-07-07 10:43:51 UTC

Size: 4.17 KB

patch

obsolete

>diff --git a/dix/Makefile.am b/dix/Makefile.am
>index c9a19f7..414f125 100644
>--- a/dix/Makefile.am
>+++ b/dix/Makefile.am
>@@ -29,7 +29,8 @@ libdix_la_SOURCES = 	\
> 	swaprep.c	\
> 	swapreq.c	\
> 	tables.c	\
>-	window.c
>+	window.c	\
>+	strcasecmp.c
> 
> libxpstubs_la_SOURCES =	\
> 	xpstubs.c
>diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
>index d1b806a..9023a0c 100644
>--- a/hw/xfree86/dixmods/Makefile.am
>+++ b/hw/xfree86/dixmods/Makefile.am
>@@ -95,6 +95,7 @@ libtype1_la_SOURCES = type1mod.c
> libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
> 
> libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c
>+libxorgxkb_la_LIBADD = $(top_builddir)/dix/libdix.la
> 
> libxtrap_la_LDFLAGS = -avoid-version
> libxtrap_la_LIBADD = $(top_builddir)/XTrap/libxtrap.la
>diff --git a/hw/xfree86/dixmods/xkbPrivate.c b/hw/xfree86/dixmods/xkbPrivate.c
>index 0479bca..b986432 100644
>--- a/hw/xfree86/dixmods/xkbPrivate.c
>+++ b/hw/xfree86/dixmods/xkbPrivate.c
>@@ -26,13 +26,13 @@ XkbDDXPrivate(DeviceIntPtr dev,KeyCode k
>     if (xf86act->type == XkbSA_XFree86Private) {
>         memcpy(msgbuf, xf86act->data, XkbAnyActionDataSize);
>         msgbuf[XkbAnyActionDataSize]= '\0';
>-        if (strcmp(msgbuf, "-vmode")==0)
>+        if (strcasecmp(msgbuf, "-vmode")==0)
>             xf86ProcessActionEvent(ACTION_PREV_MODE, NULL);
>-        else if (strcmp(msgbuf, "+vmode")==0)
>+        else if (strcasecmp(msgbuf, "+vmode")==0)
>             xf86ProcessActionEvent(ACTION_NEXT_MODE, NULL);
>-        else if (strcmp(msgbuf, "ungrab")==0)
>+        else if (strcasecmp(msgbuf, "ungrab")==0)
>             xf86ProcessActionEvent(ACTION_DISABLEGRAB, NULL);
>-        else if (strcmp(msgbuf, "clsgrb")==0)
>+        else if (strcasecmp(msgbuf, "clsgrb")==0)
>             xf86ProcessActionEvent(ACTION_CLOSECLIENT, NULL);
>         else
>             xf86ProcessActionEvent(ACTION_MESSAGE, (void *) msgbuf);
>diff --git a/include/dix.h b/include/dix.h
>index 0177721..84fc849 100644
>--- a/include/dix.h
>+++ b/include/dix.h
>@@ -820,4 +820,10 @@ typedef struct {
>     SelectionCallbackKind   kind;
> } SelectionInfoRec;
> 
>+/* strcasecmp.c */
>+#if NEED_STRCASECMP
>+#define strcasecmp xstrcasecmp
>+extern int xstrcasecmp(char *s1, char *s2);
>+#endif
>+
> #endif /* DIX_H */
>diff --git a/xkb/maprules.c b/xkb/maprules.c
>index d4e9829..eff02ad 100644
>--- a/xkb/maprules.c
>+++ b/xkb/maprules.c
>@@ -62,12 +62,6 @@ #define PR_DEBUG1(s,a)
> #define PR_DEBUG2(s,a,b)
> #endif
> 
>-#ifdef NEED_STRCASECMP
>-extern int _XkbStrCaseCmp(char *s1, char *s2);
>-#else
>-#define _XkbStrCaseCmp strcasecmp
>-#endif
>-
> /***====================================================================***/
> 
> #define DFLT_LINE_SIZE	128
>@@ -1092,20 +1086,20 @@ int			len,headingtype,extra_ndx = 0;
>     for ( ; GetInputLine(file,&line,False); line.num_line= 0) {
> 	if (line.line[0]=='!') {
> 	    tok = strtok(&(line.line[1]), " \t");
>-	    if (_XkbStrCaseCmp(tok,"model") == 0)
>+	    if (strcasecmp(tok,"model") == 0)
> 		headingtype = HEAD_MODEL;
>-	    else if (_XkbStrCaseCmp(tok,"layout") == 0)
>+	    else if (strcasecmp(tok,"layout") == 0)
> 		headingtype = HEAD_LAYOUT;
>-	    else if (_XkbStrCaseCmp(tok,"variant") == 0)
>+	    else if (strcasecmp(tok,"variant") == 0)
> 		headingtype = HEAD_VARIANT;
>-	    else if (_XkbStrCaseCmp(tok,"option") == 0)
>+	    else if (strcasecmp(tok,"option") == 0)
> 		headingtype = HEAD_OPTION;
> 	    else {
> 		int i;
> 		headingtype = HEAD_EXTRA;
> 		extra_ndx= -1;
> 		for (i=0;(i<rules->num_extra)&&(extra_ndx<0);i++) {
>-		    if (!_XkbStrCaseCmp(tok,rules->extra_names[i]))
>+		    if (!strcasecmp(tok,rules->extra_names[i]))
> 			extra_ndx= i;
> 		}
> 		if (extra_ndx<0) {
>diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c
>index 3389ba8..3ed68c2 100644
>--- a/xkb/xkbfmisc.c
>+++ b/xkb/xkbfmisc.c
>@@ -247,19 +247,3 @@ XkbNameMatchesPattern(char *name,char *p
>     /* if we get here, the pattern is exhausted (-:just like me:-) */
>     return (name[0]=='\0');
> }
>-
>-#ifdef NEED_STRCASECMP
>-_X_HIDDEN int
>-_XkbStrCaseCmp(char *str1,char *str2)
>-{
>-    const u_char *us1 = (const u_char *)str1, *us2 = (const u_char *)str2;
>-
>-    while (tolower(*us1) == tolower(*us2)) {
>-        if (*us1++ == '\0')
>-            return (0);
>-        us2++;
>-    }
>-
>-    return (tolower(*us1) - tolower(*us2));
>-}
>-#endif

Actions: View | Splinter Review

Attachments on bug 7097: 5789 | 6090 | 6157

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.