dgaudet 98/02/01 12:54:46
Modified: src/main alloc.c src/include alloc.h Log: the new table_xxxn() API should use const char * pointers Revision Changes Path 1.74 +10 -10 apache-1.3/src/main/alloc.c Index: alloc.c =================================================================== RCS file: /export/home/cvs/apache-1.3/src/main/alloc.c,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- alloc.c 1998/01/31 00:24:32 1.73 +++ alloc.c 1998/02/01 20:54:44 1.74 @@ -1003,7 +1003,7 @@ } } -API_EXPORT(void) table_setn(table *t, char *key, char *val) +API_EXPORT(void) table_setn(table *t, const char *key, const char *val) { register int i, j, k; table_entry *elts = (table_entry *) t->a.elts; @@ -1025,7 +1025,7 @@ for (i = 0; i < t->a.nelts; ) { if (!strcasecmp(elts[i].key, key)) { if (!done) { - elts[i].val = val; + elts[i].val = (char *)val; done = 1; ++i; } @@ -1044,8 +1044,8 @@ if (!done) { elts = (table_entry *) table_push(t); - elts->key = key; - elts->val = val; + elts->key = (char *)key; + elts->val = (char *)val; } } @@ -1090,7 +1090,7 @@ elts->val = pstrdup(t->a.pool, val); } -API_EXPORT(void) table_mergen(table *t, char *key, char *val) +API_EXPORT(void) table_mergen(table *t, const char *key, const char *val) { table_entry *elts = (table_entry *) t->a.elts; int i; @@ -1116,8 +1116,8 @@ } elts = (table_entry *) table_push(t); - elts->key = key; - elts->val = val; + elts->key = (char *)key; + elts->val = (char *)val; } API_EXPORT(void) table_add(table *t, const char *key, const char *val) @@ -1129,7 +1129,7 @@ elts->val = pstrdup(t->a.pool, val); } -API_EXPORT(void) table_addn(table *t, char *key, char *val) +API_EXPORT(void) table_addn(table *t, const char *key, const char *val) { table_entry *elts = (table_entry *) t->a.elts; @@ -1147,8 +1147,8 @@ #endif elts = (table_entry *) table_push(t); - elts->key = key; - elts->val = val; + elts->key = (char *)key; + elts->val = (char *)val; } API_EXPORT(table *) overlay_tables(pool *p, const table *overlay, const table *base) 1.45 +3 -3 apache-1.3/src/include/alloc.h Index: alloc.h =================================================================== RCS file: /export/home/cvs/apache-1.3/src/include/alloc.h,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- alloc.h 1998/01/27 10:00:40 1.44 +++ alloc.h 1998/02/01 20:54:45 1.45 @@ -164,12 +164,12 @@ API_EXPORT(void) clear_table(table *); API_EXPORT(char *) table_get(const table *, const char *); API_EXPORT(void) table_set(table *, const char *name, const char *val); -API_EXPORT(void) table_setn(table *, char *name, char *val); +API_EXPORT(void) table_setn(table *, const char *name, const char *val); API_EXPORT(void) table_merge(table *, const char *name, const char *more_val); -API_EXPORT(void) table_mergen(table *, char *name, char *more_val); +API_EXPORT(void) table_mergen(table *, const char *name, const char *more_val); API_EXPORT(void) table_unset(table *, const char *key); API_EXPORT(void) table_add(table *, const char *name, const char *val); -API_EXPORT(void) table_addn(table *, char *name, char *val); +API_EXPORT(void) table_addn(table *, const char *name, const char *val); API_EXPORT(void) table_do(int (*comp) (void *, const char *, const char *), void *rec, const table *t,...);