svn merge ^/branches/released .

2 files changed, 13 insertions, 19 deletions

diff --git a/xorg-server/hw/xfree86/loader/loadext.c b/xorg-server/hw/xfree86/loader/loadext.c
index 26066856d..8380c300b 100644
--- a/xorg-server/hw/xfree86/loader/loadext.c
+++ b/xorg-server/hw/xfree86/loader/loadext.c
@@ -163,7 +163,7 @@ get_node(const char *name)
     for (n = graph; n && n->n_name && strcmp(n->n_name, name);

 	 n = n->n_next) ;

     if (n)

-	return (n);

+	return n;

 

     n = xnfalloc(sizeof(NODE));

 

@@ -180,7 +180,7 @@ get_node(const char *name)
     n->n_prevp = &graph;

     graph = n;

 

-    return (n);

+    return n;

 }

 

 /*

@@ -285,7 +285,7 @@ find_cycle(NODE * from, NODE * to, int longest_len, int depth)
      * to be acyclic

      */

     if (from->n_flags & (NF_NODEST | NF_MARK | NF_ACYCLIC))

-	return (0);

+	return 0;

     from->n_flags |= NF_MARK;

 

     for (np = from->n_arcs, i = from->n_narcs; --i >= 0; np++) {

@@ -317,7 +317,7 @@ find_cycle(NODE * from, NODE * to, int longest_len, int depth)
 	}

     }

     from->n_flags &= ~NF_MARK;

-    return (longest_len);

+    return longest_len;

 }

 

 /* do topological sort on graph */

@@ -378,10 +378,8 @@ tsort(void)
 	if (n == NULL)

 	    ErrorF("tsort: internal error -- could not find cycle");

     }

-    if (cycle_buf)

-	free(cycle_buf);

-    if (longest_cycle)

-	free(longest_cycle);

+    free(cycle_buf);

+    free(longest_cycle);

     if (graph)

 	free_nodes(graph);

 }

diff --git a/xorg-server/hw/xfree86/loader/loadmod.c b/xorg-server/hw/xfree86/loader/loadmod.c
index e75ec8f69..171f0521e 100644
--- a/xorg-server/hw/xfree86/loader/loadmod.c
+++ b/xorg-server/hw/xfree86/loader/loadmod.c
@@ -114,7 +114,7 @@ static char **defaultPathList = NULL;
 static Bool

 PathIsAbsolute(const char *path)

 {

-    return (*path == '/');

+    return *path == '/';

 }	

 

 /*

@@ -315,16 +315,14 @@ InitSubdirs(const char **subdirlist)
 		if (**s == '/' || **s == '\\' || strchr(*s, ':') ||

 		    strstr(*s, "..")) {

 		    xf86Msg(X_ERROR, "InitSubdirs: Bad subdir: \"%s\"\n", *s);

-		    if (tmp_subdirlist)

-			free(tmp_subdirlist);

+		    free(tmp_subdirlist);

 		    return NULL;

 		}

 	    }

 	}

 	subdirs = malloc((i * 2 + 1) * sizeof(char *));

 	if (!subdirs) {

-	    if (tmp_subdirlist)

-		free(tmp_subdirlist);

+	    free(tmp_subdirlist);

 	    return NULL;

 	}

 	i = 0;

@@ -348,8 +346,7 @@ InitSubdirs(const char **subdirlist)
 		while (--i >= 0)

 		    free(subdirs[i]);

 		free(subdirs);

-		if (tmp_subdirlist)

-		    free(tmp_subdirlist);

+		free(tmp_subdirlist);

 		return NULL;

 	    }

 	    /* tack on the OS name */

@@ -367,8 +364,7 @@ InitSubdirs(const char **subdirlist)
 	}

 	subdirs[i] = NULL;

     }

-    if (tmp_subdirlist)

-	free(tmp_subdirlist);

+    free(tmp_subdirlist);

     return (const char **)subdirs;

 }

 

@@ -743,7 +739,7 @@ static ModuleDescPtr
 AddSibling(ModuleDescPtr head, ModuleDescPtr new)

 {

     new->sib = head;

-    return (new);

+    return new;

 }

 

 pointer

@@ -793,7 +789,7 @@ NewModuleDesc(const char *name)
 	mdp->TearDownData = NULL;

     }

 

-    return (mdp);

+    return mdp;

 }

 

 ModuleDescPtr