From: Jim Meyering <jim@meyering.net>
Date: Fri, 6 Jun 2003 21:07:23 +0000 (+0000)
Subject: Merge from coreutils.
X-Git-Tag: cvs-readonly~4818
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=437df36c45f7643f0b40d2dc5100b2490613702d;p=gnulib.git

Merge from coreutils.
(same_name): Declare *_basename locals to be `const'.
Consolidate declarations and initializations of *_base* locals.
---

diff --git a/lib/same.c b/lib/same.c
index 8b4985de5..d41cccc46 100644
--- a/lib/same.c
+++ b/lib/same.c
@@ -64,14 +64,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)
     {