Changeset 2591 for trunk/src/kmk/hash.c


Ignore:
Timestamp:
Jun 17, 2012, 10:45:31 PM (13 years ago)
Author:
bird
Message:

kmk: Merged in changes from GNU make 3.82. Previous GNU make base version was gnumake-2008-10-28-CVS.

Location:
trunk/src/kmk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/kmk

    • Property svn:ignore

      •  

        old new  
        1313stamp-*
        1414makebook*
         15
        1516.*gdbinit
         17.gdb_history
         18
        1619*.dep
        1720*.dvi
        … …  
        3134*.pg
        3235*.pgs
         36
        3337README
        3438README.DOS
        3539README.W32
         40README.OS2
        3641aclocal.m4
        3742autom4te.cache
        … …  
        5257config.h.W32
        5358config.h-vms
         59
        5460loadavg
        5561loadavg.c
        5662make
         63
        5764.deps
        5865.dep_segment
         66ID
         67TAGS
         68
        5969_*
        6070sun4
        … …  
        7282sol2
        7383i486-linux
         84
        7485customs
         86
        7587install-sh
        7688mkinstalldirs
         89
         90.directive.asc

  • trunk/src/kmk/hash.c

    r1993 r2591  
    11/* hash.c -- hash table maintenance
    2 Copyright (C) 1995, 1999, 2002 Free Software Foundation, Inc.
     2Copyright (C) 1995, 1999, 2002, 2010 Free Software Foundation, Inc.
    33Written by Greg McGary <gkm@gnu.org> <greg@mcgary.org>
    44
    … …  
    5151  if (ht->ht_vec == 0)
    5252    {
    53       fprintf (stderr, _("can't allocate %ld bytes for hash table: memory exhausted"),
    54                ht->ht_size * sizeof(struct token *));
     53      fprintf (stderr, _("can't allocate %lu bytes for hash table: memory exhausted"),
     54               ht->ht_size * (unsigned long) sizeof (struct token *));
    5555      exit (1);
    5656    }
    … …  
    252252{
    253253  void **slot = hash_find_slot (ht, item);
    254   const void *old_item = slot ? *slot : 0;
     254  const void *old_item = *slot;
    255255  hash_insert_at (ht, item, slot);
    256256  return (void *)((HASH_VACANT (old_item)) ? 0 : old_item);
Note: See TracChangeset for help on using the changeset viewer.