open, openat: minor optimization

* lib/open.c (open): If open succeeded, len is non-zero.
* lib/openat.c (rpl_openat): Likewise.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 33dc8aef1eb8c6c42decec7e90030f8d93b4e6cd..4abbe70348a767a9136f201ab412a2c50c53215d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-09-22  Eric Blake  <ebb9@byu.net>
 
+       open, openat: minor optimization
+       * lib/open.c (open): If open succeeded, len is non-zero.
+       * lib/openat.c (rpl_openat): Likewise.
+
        link-follow: ensure correct result
        * m4/fcntl_h.m4 (gl_FCNTL_H): Clean up temporary file.
        * m4/link-follow.m4 (gl_FUNC_LINK_FOLLOWS_SYMLINK): Likewise, and

diff --git a/lib/open.c b/lib/open.c
index 08ecaff44b49efb636931828e54b6b89861445d8..7cc25bd07c9511f94b87fce85c442d35e5fb92b0 100644 (file)
--- a/lib/open.c
+++ b/lib/open.c
@@ -141,8 +141,9 @@ open (const char *filename, int flags, ...)
      with ENOTDIR.  */
   if (fd >= 0)
     {
+      /* We know len is positive, since open did not fail with ENOENT.  */
       size_t len = strlen (filename);
-      if (len > 0 && filename[len - 1] == '/')
+      if (filename[len - 1] == '/')
        {
          struct stat statbuf;
 

diff --git a/lib/openat.c b/lib/openat.c
index 7e46a2672be613f948bae41dd30b78de4ed63b45..079039fee3a40d29377c1b9e8463e970f87601b6 100644 (file)
--- a/lib/openat.c
+++ b/lib/openat.c
@@ -103,8 +103,9 @@ rpl_openat (int dfd, char const *filename, int flags, ...)
      with ENOTDIR.  */
   if (fd >= 0)
     {
+      /* We know len is positive, since open did not fail with ENOENT.  */
       size_t len = strlen (filename);
-      if (len > 0 && filename[len - 1] == '/')
+      if (filename[len - 1] == '/')
        {
          struct stat statbuf;