More changes, mostly C89 related.

[gnulib.git] / lib / same.c

diff --git a/lib/same.c b/lib/same.c
index 8b4985d..7dad198 100644 (file)
--- a/lib/same.c
+++ b/lib/same.c
@@ -25,9 +25,7 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
@@ -36,24 +34,13 @@
 extern int errno;
 #endif
 
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
 
 #include "same.h"
 #include "dirname.h"
 #include "error.h"
 #include "xalloc.h"
 
-#ifndef HAVE_DECL_FREE
-"this configure-time declaration test was not run"
-#endif
-#if !HAVE_DECL_FREE
-void free ();
-#endif
-
 #define SAME_INODE(Stat_buf_1, Stat_buf_2) \
   ((Stat_buf_1).st_ino == (Stat_buf_2).st_ino \
    && (Stat_buf_1).st_dev == (Stat_buf_2).st_dev)
@@ -64,14 +51,12 @@ void free ();
 int
 same_name (const char *source, const char *dest)
 {
-  char *source_basename, *dest_basename;
-  size_t source_baselen, dest_baselen;
-
   /* Compare the basenames.  */
-  source_basename = base_name (source);
-  dest_basename = base_name (dest);
-  source_baselen = base_len (source_basename);
-  dest_baselen = base_len (dest_basename);
+  char const *source_basename = base_name (source);
+  char const *dest_basename = base_name (dest);
+  size_t source_baselen = base_len (source_basename);
+  size_t dest_baselen = base_len (dest_basename);
+
   if (source_baselen == dest_baselen
       && memcmp (source_basename, dest_basename, dest_baselen) == 0)
     {