svn merge ^/branches/released .

3 files changed, 16 insertions, 27 deletions

diff --git a/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c b/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c
index da573dacb..2b81c276c 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c
@@ -831,10 +831,8 @@ out:
         XFreeGC (dpy, gc) ;

         gc = NULL ;

     }

-    if (rects) {

-        free (rects) ;

-        rects = NULL ;

-    }

+    free(rects);

+    rects = NULL;

     EPHYR_LOG ("leave\n") ;

     return is_ok ;

 }

diff --git a/xorg-server/hw/kdrive/ephyr/hostx.c b/xorg-server/hw/kdrive/ephyr/hostx.c
index 4eb9cc1c0..320541f82 100644
--- a/xorg-server/hw/kdrive/ephyr/hostx.c
+++ b/xorg-server/hw/kdrive/ephyr/hostx.c
@@ -683,11 +683,8 @@ hostx_screen_init (EphyrScreenInfo screen,
 	}

       else

 	{

-	  if (host_screen->ximg->data) 

-	    {

-	      free(host_screen->ximg->data);

-	      host_screen->ximg->data = NULL;

-	    } 

+	  free(host_screen->ximg->data);

+	  host_screen->ximg->data = NULL;

 

 	  XDestroyImage(host_screen->ximg);

 	}

@@ -1186,10 +1183,8 @@ out:
         XFree (visuals) ;

         visuals = NULL;

     }

-    if (host_visuals) {

-        free (host_visuals) ;

-        host_visuals = NULL;

-    }

+    free(host_visuals);

+    host_visuals = NULL;

     EPHYR_LOG ("leave\n") ;

     return is_ok ;

 

@@ -1322,10 +1317,8 @@ hostx_set_window_bounding_rectangles (int a_window,
 #endif

     is_ok = TRUE ;

 

-    if (rects) {

-        free (rects) ;

-        rects = NULL ;

-    }

+    free(rects);

+    rects = NULL;

     EPHYR_LOG ("leave\n") ;

     return is_ok;

 }

@@ -1363,10 +1356,8 @@ hostx_set_window_clipping_rectangles (int a_window,
 #endif

     is_ok = TRUE ;

 

-    if (rects) {

-        free (rects) ;

-        rects = NULL ;

-    }

+    free(rects);

+    rects = NULL;

     EPHYR_LOG ("leave\n") ;

     return is_ok;

 }

diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c
index d1b12b890..5b17163da 100644
--- a/xorg-server/hw/kdrive/src/kinput.c
+++ b/xorg-server/hw/kdrive/src/kinput.c
@@ -942,7 +942,7 @@ KdAddConfigKeyboard (char *keyboard)
     if (!new)

         return BadAlloc;

 

-    new->line = xstrdup(keyboard);

+    new->line = strdup(keyboard);

     new->next = NULL;

 

     for (prev = &kdConfigKeyboards; *prev; prev = &(*prev)->next);

@@ -1010,7 +1010,7 @@ KdAddConfigPointer (char *pointer)
     if (!new)

         return BadAlloc;

 

-    new->line = xstrdup(pointer);

+    new->line = strdup(pointer);

     new->next = NULL;

 

     for (prev = &kdConfigPointers; *prev; prev = &(*prev)->next);

@@ -1090,11 +1090,11 @@ KdGetOptions (InputOption **options, char *string)
         newopt->key = (char *)malloc(tam_key);

         strncpy(newopt->key, string, tam_key);

         newopt->key[tam_key] = '\0';

-        newopt->value = xstrdup(strchr(string, '=') + 1);

+        newopt->value = strdup(strchr(string, '=') + 1);

     }

     else

     {

-        newopt->key = xstrdup(string);

+        newopt->key = strdup(string);

         newopt->value = NULL;

     }

     newopt->next = NULL;

@@ -1170,7 +1170,7 @@ KdParseKeyboard (char *arg)
     if (strcmp (save, "auto") == 0)

         ki->driverPrivate = NULL;

     else

-        ki->driverPrivate = xstrdup(save);

+        ki->driverPrivate = strdup(save);

 

     if (delim != ',')

     {

@@ -1266,7 +1266,7 @@ KdParsePointer (char *arg)
     if (strcmp(save, "auto") == 0)

         pi->driverPrivate = NULL;

     else

-        pi->driverPrivate = xstrdup(save);

+        pi->driverPrivate = strdup(save);

 

     if (delim != ',')

     {