gdb/

	Code cleanup.
	* source.c (add_path): Remove always true conditional 'p == 0' and
	unindent its code block.

2 files changed, 31 insertions, 28 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index baf556b..4e6aef0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Code cleanup.
+	* source.c (add_path): Remove always true conditional 'p == 0' and
+	unindent its code block.
+
 2012-04-17  Pedro Alves  <palves@redhat.com>
 
 	* gdbtypes.h (FIELD_BITPOS): Rename to ...
diff --git a/gdb/source.c b/gdb/source.c
index 9b464f9..8e7acf8 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -573,6 +573,7 @@ add_path (char *dirname, char **which_path, int parse_separators)
     append:
       {
 	unsigned int len = strlen (name);
+	char tinybuf[2];
 
 	p = *which_path;
 	while (1)
@@ -596,37 +597,33 @@ add_path (char *dirname, char **which_path, int parse_separators)
 	    else
 	      break;
 	  }
-	if (p == 0)
-	  {
-	    char tinybuf[2];
 
-	    tinybuf[0] = DIRNAME_SEPARATOR;
-	    tinybuf[1] = '\0';
+	tinybuf[0] = DIRNAME_SEPARATOR;
+	tinybuf[1] = '\0';
 
-	    /* If we have already tacked on a name(s) in this command,
-	       be sure they stay on the front as we tack on some
-	       more.  */
-	    if (prefix)
-	      {
-		char *temp, c;
-
-		c = old[prefix];
-		old[prefix] = '\0';
-		temp = concat (old, tinybuf, name, (char *)NULL);
-		old[prefix] = c;
-		*which_path = concat (temp, "", &old[prefix], (char *) NULL);
-		prefix = strlen (temp);
-		xfree (temp);
-	      }
-	    else
-	      {
-		*which_path = concat (name, (old[0] ? tinybuf : old),
-				      old, (char *)NULL);
-		prefix = strlen (name);
-	      }
-	    xfree (old);
-	    old = *which_path;
+	/* If we have already tacked on a name(s) in this command,
+	   be sure they stay on the front as we tack on some
+	   more.  */
+	if (prefix)
+	  {
+	    char *temp, c;
+
+	    c = old[prefix];
+	    old[prefix] = '\0';
+	    temp = concat (old, tinybuf, name, (char *)NULL);
+	    old[prefix] = c;
+	    *which_path = concat (temp, "", &old[prefix], (char *) NULL);
+	    prefix = strlen (temp);
+	    xfree (temp);
+	  }
+	else
+	  {
+	    *which_path = concat (name, (old[0] ? tinybuf : old),
+				  old, (char *)NULL);
+	    prefix = strlen (name);
 	  }
+	xfree (old);
+	old = *which_path;
       }
     skip_dup:
       ;