svn merge ^/branches/released .

5 files changed, 18 insertions, 23 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86Configure.c b/xorg-server/hw/xfree86/common/xf86Configure.c
index c2b7464cd..94398dff5 100644
--- a/xorg-server/hw/xfree86/common/xf86Configure.c
+++ b/xorg-server/hw/xfree86/common/xf86Configure.c
@@ -277,16 +277,16 @@ configureInputSection (void)
     mouse->inp_identifier = "Mouse0";

     mouse->inp_driver = "mouse";

     mouse->inp_option_lst = 

-		xf86addNewOption(mouse->inp_option_lst, xstrdup("Protocol"),

-				xstrdup(DFLT_MOUSE_PROTO));

+		xf86addNewOption(mouse->inp_option_lst, strdup("Protocol"),

+				strdup(DFLT_MOUSE_PROTO));

 #ifndef __SCO__

     mouse->inp_option_lst = 

-		xf86addNewOption(mouse->inp_option_lst, xstrdup("Device"),

-				xstrdup(DFLT_MOUSE_DEV));

+		xf86addNewOption(mouse->inp_option_lst, strdup("Device"),

+				strdup(DFLT_MOUSE_DEV));

 #endif

     mouse->inp_option_lst = 

-		xf86addNewOption(mouse->inp_option_lst, xstrdup("ZAxisMapping"),

-				xstrdup("4 5 6 7"));

+		xf86addNewOption(mouse->inp_option_lst, strdup("ZAxisMapping"),

+				strdup("4 5 6 7"));

     ptr = (XF86ConfInputPtr)xf86addListItem((glp)ptr, (glp)mouse);

     return ptr;

 }

@@ -389,7 +389,7 @@ configureDeviceSection (int screennum)
 	    "        ### <string>: \"String\", <freq>: \"<f> Hz/kHz/MHz\",\n"

 	    "        ### <percent>: \"<f>%\"\n"

 	    "        ### [arg]: arg optional\n";

-	ptr->dev_comment = xstrdup(descrip);

+	ptr->dev_comment = strdup(descrip);

 	if (ptr->dev_comment) {

     	    for (p = DevToConfig[screennum].GDev.options;

 		 p->name != NULL; p++) {

@@ -440,7 +440,7 @@ configureLayoutSection (void)
 	iptr->iref_option_lst = NULL;

 	iptr->iref_inputdev_str = "Mouse0";

 	iptr->iref_option_lst =

-		xf86addNewOption (iptr->iref_option_lst, xstrdup("CorePointer"), NULL);

+		xf86addNewOption (iptr->iref_option_lst, strdup("CorePointer"), NULL);

 	ptr->lay_input_lst = (XF86ConfInputrefPtr)

 		xf86addListItem ((glp) ptr->lay_input_lst, (glp) iptr);

     }

@@ -453,7 +453,7 @@ configureLayoutSection (void)
 	iptr->iref_option_lst = NULL;

 	iptr->iref_inputdev_str = "Keyboard0";

 	iptr->iref_option_lst =

-		xf86addNewOption (iptr->iref_option_lst, xstrdup("CoreKeyboard"), NULL);

+		xf86addNewOption (iptr->iref_option_lst, strdup("CoreKeyboard"), NULL);

 	ptr->lay_input_lst = (XF86ConfInputrefPtr)

 		xf86addListItem ((glp) ptr->lay_input_lst, (glp) iptr);

     }

@@ -626,7 +626,7 @@ configureDDCMonitorSection (int screennum)
                              ptr);

 

     if (ConfiguredMonitor->features.dpms) {

-      ptr->mon_option_lst = xf86addNewOption(ptr->mon_option_lst, xstrdup("DPMS"), NULL);

+      ptr->mon_option_lst = xf86addNewOption(ptr->mon_option_lst, strdup("DPMS"), NULL);

     }

 

     return ptr;

diff --git a/xorg-server/hw/xfree86/common/xf86Option.c b/xorg-server/hw/xfree86/common/xf86Option.c
index 5b20229a9..8dce3ad0f 100644
--- a/xorg-server/hw/xfree86/common/xf86Option.c
+++ b/xorg-server/hw/xfree86/common/xf86Option.c
@@ -209,7 +209,7 @@ LookupStrOption(pointer optlist, const char *name, char *deflt, Bool markUsed)
     if (ParseOptionValue(-1, optlist, &o, markUsed))

         deflt = o.value.str;

     if (deflt)

-	return xstrdup(deflt);

+	return strdup(deflt);

     else

 	return NULL;

 }

diff --git a/xorg-server/hw/xfree86/loader/loadmod.c b/xorg-server/hw/xfree86/loader/loadmod.c
index 171f0521e..82739e46e 100644
--- a/xorg-server/hw/xfree86/loader/loadmod.c
+++ b/xorg-server/hw/xfree86/loader/loadmod.c
@@ -135,7 +135,7 @@ InitPathList(const char *path)
     if (!path)

 	return defaultPathList;

 

-    fullpath = xstrdup(path);

+    fullpath = strdup(path);

     if (!fullpath)

 	return NULL;

     elem = strtok(fullpath, ",");

@@ -353,7 +353,7 @@ InitSubdirs(const char **subdirlist)
 	    sprintf(subdirs[i], "%s%s%s/", *s, slash, osname);

 	    i++;

 	    /* path as given */

-	    subdirs[i] = xstrdup(*s);

+	    subdirs[i] = strdup(*s);

 	    i++;

 	    s++;

 	    if (indefault && !s) {

@@ -1246,7 +1246,7 @@ LoaderGetCanonicalName(const char *modname, PatternPtr patterns)
 	}

 

     /* If there is no match, return the whole name minus the leading path */

-    return xstrdup(s);

+    return strdup(s);

 }

 

 /*

diff --git a/xorg-server/hw/xfree86/modes/xf86Cursors.c b/xorg-server/hw/xfree86/modes/xf86Cursors.c
index e9770f8b9..4cf6147bb 100644
--- a/xorg-server/hw/xfree86/modes/xf86Cursors.c
+++ b/xorg-server/hw/xfree86/modes/xf86Cursors.c
@@ -659,11 +659,8 @@ xf86_cursors_fini (ScreenPtr screen)
 	xf86DestroyCursorInfoRec (xf86_config->cursor_info);

 	xf86_config->cursor_info = NULL;

     }

-    if (xf86_config->cursor_image)

-    {

-	free(xf86_config->cursor_image);

-	xf86_config->cursor_image = NULL;

-    }

+    free(xf86_config->cursor_image);

+    xf86_config->cursor_image = NULL;

     if (xf86_config->cursor)

     {

 	FreeCursor (xf86_config->cursor, None);

diff --git a/xorg-server/hw/xfree86/os-support/bus/Sbus.c b/xorg-server/hw/xfree86/os-support/bus/Sbus.c
index 4560ef016..7c4888126 100644
--- a/xorg-server/hw/xfree86/os-support/bus/Sbus.c
+++ b/xorg-server/hw/xfree86/os-support/bus/Sbus.c
@@ -191,10 +191,8 @@ sparcPromClose(void)
 	close(promFd);

 	promFd = -1;

     }

-    if (promOpio) {

-	free(promOpio);

-	promOpio = NULL;

-    }

+    free(promOpio);

+    promOpio = NULL;

     promOpenCount = 0;

 }