From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 26 Feb 2004 20:38:54 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/fedora-base~765
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=d3a4681c8d690cc0f5d0fc759f52264f80051989;p=glibc.git

Update.

	* stdlib/canonicalize.c (__realpath): Simplify.
---

diff --git a/ChangeLog b/ChangeLog
index 5221f5f3c4..4fe5c858e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-02-26  Ulrich Drepper  <drepper@redhat.com>
 
+	* stdlib/canonicalize.c (__realpath): Simplify.
+
 	* posix/regcomp.c (parse_expression): Avoid duplication in calls
 	to build_charclass_op.
 
diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c
index 0947c67dd2..8388316df3 100644
--- a/stdlib/canonicalize.c
+++ b/stdlib/canonicalize.c
@@ -206,7 +206,7 @@ __realpath (const char *name, char *resolved)
   *dest = '\0';
 
   assert (resolved == NULL || resolved == rpath);
-  return resolved ?: rpath;
+  return rpath;
 
 error:
   assert (resolved == NULL || resolved == rpath);