ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/lookup.h
(Generate patch)

Comparing ray/src/common/lookup.h (file contents):
Revision 2.8 by schorsch, Fri Jun 6 16:38:47 2003 UTC vs.
Revision 2.14 by greg, Tue May 25 22:04:13 2004 UTC

# Line 4 | Line 4
4   */
5   #ifndef _RAD_LOOKUP_H_
6   #define _RAD_LOOKUP_H_
7 +
8   #ifdef __cplusplus
9   extern "C" {
10   #endif
11  
12 + typedef void lut_free_t(void *p);
13 + typedef unsigned long lut_hashf_t(const void *);
14 + typedef int lut_keycmpf_t(const void *, const void *);
15  
12 #include "copyright.h"
13
16   typedef struct {
17          char    *key;                   /* key name */
18          unsigned long   hval;           /* key hash value (for efficiency) */
# Line 18 | Line 20 | typedef struct {
20   } LUENT;
21  
22   typedef struct {
23 <        unsigned long   (*hashf)();     /* key hash function */
24 <        int     (*keycmp)();            /* key comparison function */
25 <        void    (*freek)();             /* free a key */
26 <        void    (*freed)();             /* free the data */
23 >        lut_hashf_t *hashf;     /* key hash function */
24 >        lut_keycmpf_t *keycmp;  /* key comparison function */
25 >        lut_free_t *freek;              /* free a key */
26 >        lut_free_t *freed;              /* free the data */
27          int     tsiz;                   /* current table size */
28          LUENT   *tabl;                  /* table, if allocated */
29          int     ndel;                   /* number of deleted entries */
30   } LUTAB;
31  
30 #undef strcmp
31 #define LU_SINIT(fk,fd)         {lu_shash,strcmp,(void (*)())(fk),\
32                                (void (*)())(fd),0,NULL,0}
32  
33   /*
34   * The lu_init routine is called to initialize a table.  The number of
# Line 78 | Line 77 | typedef struct {
77   * allocated table itself.
78   */
79  
80 < #include <string.h> /* strcmp() */
80 > typedef int lut_doallf_t(const LUENT *e, void *p);
81  
82 + extern lut_keycmpf_t lu_strcmp;
83   extern int      lu_init(LUTAB *tbl, int nel);
84 < extern unsigned long    lu_shash(char *s);
85 < extern LUENT    *lu_find(LUTAB *tbl, char *key);
86 < extern void     lu_delete(LUTAB *tbl, char *key);
87 < extern int      lu_doall(LUTAB *tbl, int (*f)());
84 > extern unsigned long    lu_shash(const void *s);
85 > extern LUENT    *lu_find(LUTAB *tbl, const char *key);
86 > extern void     lu_delete(LUTAB *tbl, const char *key);
87 > extern int      lu_doall(const LUTAB *tbl, lut_doallf_t *f, void *p);
88   extern void     lu_done(LUTAB *tbl);
89  
90 + #define LU_SINIT(fk,fd) {lu_shash,lu_strcmp,fk,fd,0,NULL,0}
91  
92   #ifdef __cplusplus
93   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines