svn merge ^/branches/released .

1 files changed, 6 insertions, 8 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);

 }