Adjust to new hash API.

[debian/tar] / src / incremen.c

diff --git a/src/incremen.c b/src/incremen.c
index 1ef55e55add66cd85ae86324e836639fdc29dc98..6fb6e31ce4b874c9951e9c2fc78a091fbf22efd9 100644 (file)
--- a/src/incremen.c
+++ b/src/incremen.c
@@ -17,14 +17,11 @@
    with this program; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#include "system.h"
+#include <system.h>
 #include <getline.h>
 #include <hash.h>
 #include <quotearg.h>
 #include "common.h"
-#define obstack_chunk_alloc xmalloc
-#define obstack_chunk_free free
-#include <obstack.h>
 
 /* Incremental dump specialities.  */
 
@@ -53,8 +50,8 @@ static Hash_table *directory_table;
 #endif
 
 /* Calculate the hash of a directory.  */
-static unsigned
-hash_directory (void const *entry, unsigned n_buckets)
+static size_t
+hash_directory (void const *entry, size_t n_buckets)
 {
   struct directory const *directory = entry;
   return hash_string (directory->name, n_buckets);
@@ -521,18 +518,18 @@ purge_directory (char const *directory_name)
          if (deref_stat (true, p, &st))
            {
              stat_diag (p);
-             WARN((0, 0, _("%s: Not purging directory %s: unable to stat"),
+             WARN((0, 0, _("%s: Not purging directory: unable to stat"),
                    quotearg_colon (p)));
-             continue; 
+             continue;
            }
          else if (one_file_system_option && st.st_dev != root_device)
            {
              WARN((0, 0,
-                   _("%s: directory %s is on a different device: not purging"),
+                   _("%s: directory is on a different device: not purging"),
                    quotearg_colon (p)));
              continue;
            }
-           
+
          if (! interactive_option || confirm ("delete", p))
            {
              if (verbose_option)