canonicalize: simplify errno handling

This file originally forked from glibc, but has had so many other
changes that it does not need to maintain glibc macros.

* lib/canonicalize.c (__set_errno): Delete macro, and use direct
assignment.

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

diff --git a/ChangeLog b/ChangeLog
index 4bfc445d7462b6f517f8bfb44e39c75a139224b8..33507bb9e682ca0473f62971491bcee84b95bf74 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-09-17  Eric Blake  <ebb9@byu.net>
 
+       canonicalize: simplify errno handling
+       * lib/canonicalize.c (__set_errno): Delete macro, and use direct
+       assignment.
+
        canonicalize, canonicalize-lgpl: update module dependencies
        * modules/canonicalize (Depends-on): Add extensions, lstat,
        pathmax, stdlib.

diff --git a/lib/canonicalize.c b/lib/canonicalize.c
index 523e08204cf0320695b6740e34b95551262163ce..c0a814d4cee300a20100306c1e6672e4e2ec2c9b 100644 (file)
--- a/lib/canonicalize.c
+++ b/lib/canonicalize.c
@@ -32,19 +32,14 @@
 #include <errno.h>
 #include <stddef.h>
 
+#include "areadlink.h"
 #include "file-set.h"
 #include "filenamecat.h"
 #include "hash-triple.h"
+#include "pathmax.h"
 #include "xalloc.h"
 #include "xgetcwd.h"
 
-#ifndef __set_errno
-# define __set_errno(Val) errno = (Val)
-#endif
-
-#include "pathmax.h"
-#include "areadlink.h"
-
 #if !(HAVE_CANONICALIZE_FILE_NAME || GNULIB_CANONICALIZE_LGPL)
 /* Return the canonical absolute name of file NAME.  A canonical name
    does not contain any `.', `..' components nor any repeated file name
@@ -62,13 +57,13 @@ canonicalize_file_name (const char *name)
 
   if (name == NULL)
     {
-      __set_errno (EINVAL);
+      errno = EINVAL;
       return NULL;
     }
 
   if (name[0] == '\0')
     {
-      __set_errno (ENOENT);
+      errno = ENOENT;
       return NULL;
     }
 
@@ -160,13 +155,13 @@ canonicalize_filename_mode (const char *name, canonicalize_mode_t can_mode)
 
   if (name == NULL)
     {
-      __set_errno (EINVAL);
+      errno = EINVAL;
       return NULL;
     }
 
   if (name[0] == '\0')
     {
-      __set_errno (ENOENT);
+      errno = ENOENT;
       return NULL;
     }
 
@@ -262,11 +257,10 @@ canonicalize_filename_mode (const char *name, canonicalize_mode_t can_mode)
                 the same symlink,NAME pair twice does indicate a loop.  */
              if (seen_triple (&ht, name, &st))
                {
-                 __set_errno (ELOOP);
                  if (can_mode == CAN_MISSING)
                    continue;
-                 else
-                   goto error;
+                 errno = ELOOP;
+                 goto error;
                }
 
              buf = areadlink_with_size (rname, st.st_size);
@@ -274,8 +268,7 @@ canonicalize_filename_mode (const char *name, canonicalize_mode_t can_mode)
                {
                  if (can_mode == CAN_MISSING && errno != ENOMEM)
                    continue;
-                 else
-                   goto error;
+                 goto error;
                }
 
              n = strlen (buf);