Import upstream version 1.26

[debian/tar] / src / misc.c

diff --git a/src/misc.c b/src/misc.c
index cb12947ac5aa4c3276b2a59af03c52a8d9062644..b75f2ab4e419e4f9a928e75b25342630f2ad17ec 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -37,8 +37,7 @@
 void
 assign_string (char **string, const char *value)
 {
-  if (*string)
-    free (*string);
+  free (*string);
   *string = value ? xstrdup (value) : 0;
 }
 
@@ -856,21 +855,6 @@ file_removed_diag (const char *name, bool top_level,
     diagfn (name);
 }
 
-void
-dir_removed_diag (const char *name, bool top_level,
-                  void (*diagfn) (char const *name))
-{
-  if (!top_level && errno == ENOENT)
-    {
-      WARNOPT (WARN_FILE_REMOVED,
-              (0, 0, _("%s: Directory removed before we read it"),
-               quotearg_colon (name)));
-      set_exit_status (TAREXIT_DIFFERS);
-    }
-  else
-    diagfn (name);
-}
-
 void
 write_fatal_details (char const *name, ssize_t status, size_t size)
 {