# HG changeset patch # User Jim Meyering # Date 1054933643 0 # Node ID 14fb4216a9b34f654d6f0d2278f7987db54d9346 # Parent 4f2163710712c8927f670860ab49e71579acbc0d 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 --- a/lib/same.c +++ b/lib/same.c @@ -64,14 +64,12 @@ int same_name (const char *source, const char *dest) { - char *source_basename, *dest_basename; - size_t source_baselen, dest_baselen; + /* Compare the basenames. */ + 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); - /* 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); if (source_baselen == dest_baselen && memcmp (source_basename, dest_basename, dest_baselen) == 0) {