mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 15:10:48 +01:00
Code Issues Projects Releases Wiki Activity

cleanups and a smidgen more docs

Browse source 
svn:r5335
This commit is contained in:
Roger Dingledine 2005-11-01 03:47:55 +00:00
parent 0fcc1a9121
commit a2a4f4ae61
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/common/container.c
View file

@ -480,7 +480,7 @@ SPLAY_PROTOTYPE(digestmap_tree, digestmap_entry_t, node,
SPLAY_GENERATE(digestmap_tree, digestmap_entry_t, node, SPLAY_GENERATE(digestmap_tree, digestmap_entry_t, node,
compare_digestmap_entries); compare_digestmap_entries);
/** Define function reate a new empty map from strings to void*'s. /** Constructor to create a new empty map from strings to void*'s.
*/ */
strmap_t * strmap_t *
strmap_new(void) strmap_new(void)
@ -491,7 +491,7 @@ strmap_new(void)
return result; return result;
} }
/** Define function reate a new empty map from digests to void*'s. /** Constructor to create a new empty map from digests to void*'s.
*/ */
digestmap_t * digestmap_t *
digestmap_new(void) digestmap_new(void)
@ -532,6 +532,7 @@ strmap_set(strmap_t *map, const char *key, void *val)
} }
} }
/** Like strmap_set() above but for digestmaps. */
void * void *
digestmap_set(digestmap_t *map, const char *key, void *val) digestmap_set(digestmap_t *map, const char *key, void *val)
{ {
@ -575,6 +576,7 @@ strmap_get(strmap_t *map, const char *key)
} }
} }
/** Like strmap_get() above but for digestmaps. */
void * void *
digestmap_get(digestmap_t *map, const char *key) digestmap_get(digestmap_t *map, const char *key)
{ {
@ -618,6 +620,7 @@ strmap_remove(strmap_t *map, const char *key)
} }
} }
/** Like strmap_remove() above but for digestmaps. */
void * void *
digestmap_remove(digestmap_t *map, const char *key) digestmap_remove(digestmap_t *map, const char *key)
{ {
@ -651,6 +654,7 @@ strmap_set_lc(strmap_t *map, const char *key, void *val)
tor_free(lc_key); tor_free(lc_key);
return v; return v;
} }
/** Same as strmap_get, but first converts <b>key</b> to lowercase. */ /** Same as strmap_get, but first converts <b>key</b> to lowercase. */
void * void *
strmap_get_lc(strmap_t *map, const char *key) strmap_get_lc(strmap_t *map, const char *key)
@ -662,6 +666,7 @@ strmap_get_lc(strmap_t *map, const char *key)
tor_free(lc_key); tor_free(lc_key);
return v; return v;
} }
/** Same as strmap_remove, but first converts <b>key</b> to lowercase */ /** Same as strmap_remove, but first converts <b>key</b> to lowercase */
void * void *
strmap_remove_lc(strmap_t *map, const char *key) strmap_remove_lc(strmap_t *map, const char *key)
@ -836,7 +841,6 @@ strmap_iter_done(strmap_iter_t *iter)
{ {
return iter == NULL; return iter == NULL;
} }
int int
digestmap_iter_done(digestmap_iter_t *iter) digestmap_iter_done(digestmap_iter_t *iter)
{ {
@ -861,7 +865,6 @@ strmap_free(strmap_t *map, void (*free_val)(void*))
tor_assert(SPLAY_EMPTY(&map->head)); tor_assert(SPLAY_EMPTY(&map->head));
tor_free(map); tor_free(map);
} }
void void
digestmap_free(digestmap_t *map, void (*free_val)(void*)) digestmap_free(digestmap_t *map, void (*free_val)(void*))
{ {
@ -877,8 +880,7 @@ digestmap_free(digestmap_t *map, void (*free_val)(void*))
tor_free(map); tor_free(map);
} }
/* Return true iff <b>map</b> has no entries. /** Return true iff <b>map</b> has no entries. */
*/
int int
strmap_isempty(strmap_t *map) strmap_isempty(strmap_t *map)
{ {

2
src/common/container.h
View file

@ -125,7 +125,7 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join,
void prefix##iter_get(prefix##iter_t *iter, keytype *keyp, void **valp); \ void prefix##iter_get(prefix##iter_t *iter, keytype *keyp, void **valp); \
int prefix##iter_done(prefix##iter_t *iter); int prefix##iter_done(prefix##iter_t *iter);
/* Map from const char * to void*. Implemented with a splay tree. */ /* Map from const char * to void *. Implemented with a splay tree. */
DECLARE_MAP_FNS(strmap_t, const char *, strmap_); DECLARE_MAP_FNS(strmap_t, const char *, strmap_);
DECLARE_MAP_FNS(digestmap_t, const char *, digestmap_); DECLARE_MAP_FNS(digestmap_t, const char *, digestmap_);