[PATCH:libX11 6/7] XlcDL.c: reduce code duplication

[Alan Coopersmith]

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 src/xlibi18n/XlcDL.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/xlibi18n/XlcDL.c b/src/xlibi18n/XlcDL.c
index 519103b..bc71900 100644
--- a/src/xlibi18n/XlcDL.c
+++ b/src/xlibi18n/XlcDL.c
@@ -249,6 +249,7 @@ __lc_path(const char *dl_name, const char *lc_dir)
 {
     char *path;
     size_t len;
+    char *slash_p;
 
     /*
      * reject this for possible security issue
@@ -264,24 +265,21 @@ __lc_path(const char *dl_name, const char *lc_dir)
     path = Xmalloc(len + 1);
 
     if (strchr(dl_name, '/') != NULL) {
-	char *slash_p;
 	slash_p = strrchr(lc_dir, '/');
 	*slash_p = '\0';
+    } else
+	slash_p = NULL;
+
 #if defined POSTLOCALELIBDIR
-	snprintf(path, len + 1, "%s/%s/%s.so.2",
-		 lc_dir, POSTLOCALELIBDIR, dl_name);
+    snprintf(path, len + 1, "%s/%s/%s.so.2",
+             lc_dir, POSTLOCALELIBDIR, dl_name);
 #else
-	snprintf(path, len + 1, "%s/%s.so.2", lc_dir, dl_name);
+    snprintf(path, len + 1, "%s/%s.so.2", lc_dir, dl_name);
 #endif
+
+    if (slash_p != NULL)
 	*slash_p = '/';
-    } else {
-#if defined POSTLOCALELIBDIR
-	snprintf(path, len + 1, "%s/%s/%s.so.2",
-		 lc_dir, POSTLOCALELIBDIR, dl_name);
-#else
-	snprintf(path, len + 1, "%s/%s.so.2", lc_dir, dl_name);
-#endif
-    }
+
     return path;
 }
 
-- 
2.6.1