Changeset 2596 for vendor/gnumake/current/hash.c

Timestamp:

Jun 20, 2012, 12:44:52 AM (13 years ago)

Author:

bird

Message:

gnumake/current -> 3.82-cvs.

Location:

vendor/gnumake/current

Files:

• . (modified) (1 prop)
• hash.c (modified) (3 diffs)

vendor/gnumake/current/hash.c

@@ -1 +1 @@
 /* hash.c -- hash table maintenance
-Copyright (C) 1995, 1999, 2002 Free Software Foundation, Inc.
+Copyright (C) 1995, 1999, 2002, 2010 Free Software Foundation, Inc.
 Written by Greg McGary <gkm@gnu.org> <greg@mcgary.org>
 
@@ -47 +47 @@
   if (ht->ht_vec == 0)
     {
-      fprintf (stderr, _("can't allocate %ld bytes for hash table: memory exhausted"),
-               ht->ht_size * sizeof(struct token *));
+      fprintf (stderr, _("can't allocate %lu bytes for hash table: memory exhausted"),
+               ht->ht_size * (unsigned long) sizeof (struct token *));
       exit (1);
     }
@@ -127 +127 @@
 {
   void **slot = hash_find_slot (ht, item);
-  const void *old_item = slot ? *slot : 0;
+  const void *old_item = *slot;
   hash_insert_at (ht, item, slot);
   return (void *)((HASH_VACANT (old_item)) ? 0 : old_item);