aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-02-26 20:38:54 +0000
committerUlrich Drepper <drepper@redhat.com>2004-02-26 20:38:54 +0000
commitd3a4681c8d690cc0f5d0fc759f52264f80051989 (patch)
tree832de7db08f88978c8b14cf9b3c3e9569789e3e5
parent266c1f50df28885289fdd5a8a2dddb6c65efc125 (diff)
downloadglibc-d3a4681c8d690cc0f5d0fc759f52264f80051989.tar
glibc-d3a4681c8d690cc0f5d0fc759f52264f80051989.tar.gz
glibc-d3a4681c8d690cc0f5d0fc759f52264f80051989.tar.bz2
glibc-d3a4681c8d690cc0f5d0fc759f52264f80051989.zip
Update.
* stdlib/canonicalize.c (__realpath): Simplify.
-rw-r--r--ChangeLog2
-rw-r--r--stdlib/canonicalize.c2
2 files changed, 3 insertions, 1 deletions
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);