use wxHashMap, not wxHashTable in wxXPMDecoder

[wxWidgets.git] / src / xpm / hashtab.c

diff --git a/src/xpm/hashtab.c b/src/xpm/hashtab.c
index 6efa9708b87340c68317657a52d688f53199a1d9..521a918901fa02ebb1e700d22a05ef4bb56bd979 100644 (file)
--- a/src/xpm/hashtab.c
+++ b/src/xpm/hashtab.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 1989-94 GROUPE BULL
+ * Copyright (C) 1989-95 GROUPE BULL

  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to


@@ -24,7 +24,7 @@
  */
 
 /*****************************************************************************\
  */
 
 /*****************************************************************************\

-* hashtable.c:                                                                *
+* hashtab.c:                                                                  *

 *                                                                             *
 *  XPM library                                                                *
 *                                                                             *
 *                                                                             *
 *  XPM library                                                                *
 *                                                                             *


@@ -33,15 +33,21 @@
 *                                                                             *
 \*****************************************************************************/
 
 *                                                                             *
 \*****************************************************************************/
 

-#include "xpm34p.h"
+#include "XpmI.h"

 
 LFUNC(AtomMake, xpmHashAtom, (char *name, void *data));
 LFUNC(HashTableGrows, int, (xpmHashTable * table));
 
 
 LFUNC(AtomMake, xpmHashAtom, (char *name, void *data));
 LFUNC(HashTableGrows, int, (xpmHashTable * table));
 

+#ifdef __OS2__
+/* Visual Age cannot deal with old, non-ansi, code */

 static xpmHashAtom
 static xpmHashAtom

-AtomMake(char *name, void *data)                       /* makes an atom */
-/*    char *name; */                           /* WARNING: is just pointed to */
-/*    void *data; */
+AtomMake(char* name, void* data)                       /* makes an atom */
+#else
+static xpmHashAtom
+AtomMake(name, data)                   /* makes an atom */
+    char *name;                                /* WARNING: is just pointed to */
+    void *data;
+#endif

 {
     xpmHashAtom object = (xpmHashAtom) XpmMalloc(sizeof(struct _xpmHashAtom));
 
 {
     xpmHashAtom object = (xpmHashAtom) XpmMalloc(sizeof(struct _xpmHashAtom));
 


@@ -103,8 +109,15 @@ AtomMake(char *name, void *data)                   /* makes an atom */
  *
  */
 
  *
  */
 

+#ifdef __OS2__
+/* Visual Age cannot deal with old, non-ansi, code */
+xpmHashAtom* xpmHashSlot(xpmHashTable* table, char* s)
+#else

 xpmHashAtom *
 xpmHashAtom *

-xpmHashSlot(xpmHashTable *table, char *s)
+xpmHashSlot(table, s)
+    xpmHashTable *table;
+    char *s;
+#endif

 {
     xpmHashAtom *atomTable = table->atomTable;
     unsigned int hash;
 {
     xpmHashAtom *atomTable = table->atomTable;
     unsigned int hash;


@@ -128,8 +141,14 @@ xpmHashSlot(xpmHashTable *table, char *s)
     return p;
 }
 
     return p;
 }
 

+#ifdef __OS2__
+/* Visual Age cannot deal with old, non-ansi, code */
+static int HashTableGrows(xpmHashTable* table)
+#else

 static int
 static int

-HashTableGrows(xpmHashTable *table)
+HashTableGrows(table)
+    xpmHashTable *table;
+#endif

 {
     xpmHashAtom *atomTable = table->atomTable;
     int size = table->size;
 {
     xpmHashAtom *atomTable = table->atomTable;
     int size = table->size;


@@ -162,8 +181,16 @@ HashTableGrows(xpmHashTable *table)
  * an xpmHashAtom is created if name doesn't exist, with the given data.
  */
 
  * an xpmHashAtom is created if name doesn't exist, with the given data.
  */
 

+#ifdef __OS2__
+/* Visual Age cannot deal with old, non-ansi, code */
+int xpmHashIntern(xpmHashTable* table, char* tag, void* data)
+#else

 int
 int

-xpmHashIntern(xpmHashTable *table, char *tag, void *data)
+xpmHashIntern(table, tag, data)
+    xpmHashTable *table;
+    char *tag;
+    void *data;
+#endif

 {
     xpmHashAtom *slot;
 
 {
     xpmHashAtom *slot;
 


@@ -188,8 +215,14 @@ xpmHashIntern(xpmHashTable *table, char *tag, void *data)
  *  must be called before allocating any atom
  */
 
  *  must be called before allocating any atom
  */
 

+#ifdef __OS2__
+/* Visual Age cannot deal with old, non-ansi, code */
+int xpmHashTableInit(xpmHashTable* table)
+#else

 int
 int

-xpmHashTableInit(xpmHashTable *table)
+xpmHashTableInit(table)
+    xpmHashTable *table;
+#endif

 {
     xpmHashAtom *p;
     xpmHashAtom *atomTable;
 {
     xpmHashAtom *p;
     xpmHashAtom *atomTable;


@@ -210,12 +243,21 @@ xpmHashTableInit(xpmHashTable *table)
  *   frees a hashtable and all the stored atoms
  */
 
  *   frees a hashtable and all the stored atoms
  */
 

+#ifdef __OS2__
+/* Visual Age cannot deal with old, non-ansi, code */
+void
+xpmHashTableFree(xpmHashTable* table)
+#else

 void
 void

-xpmHashTableFree(xpmHashTable *table)
+xpmHashTableFree(table)
+    xpmHashTable *table;
+#endif

 {
     xpmHashAtom *p;
     xpmHashAtom *atomTable = table->atomTable;
 
 {
     xpmHashAtom *p;
     xpmHashAtom *atomTable = table->atomTable;
 

+    if (!atomTable)
+       return;

     for (p = atomTable + table->size; p > atomTable;)
        if (*--p)
            XpmFree(*p);
     for (p = atomTable + table->size; p > atomTable;)
        if (*--p)
            XpmFree(*p);