[or-cvs] cleanups and a smidgen more docs
arma at seul.org
arma at seul.org
Tue Nov 1 03:47:57 UTC 2005
Update of /home2/or/cvsroot/tor/src/common
In directory moria:/home/arma/work/onion/cvs/tor/src/common
Modified Files:
container.c container.h
Log Message:
cleanups and a smidgen more docs
Index: container.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/common/container.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- container.c 18 Oct 2005 20:11:39 -0000 1.46
+++ container.c 1 Nov 2005 03:47:55 -0000 1.47
@@ -480,7 +480,7 @@
SPLAY_GENERATE(digestmap_tree, digestmap_entry_t, node,
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_new(void)
@@ -491,7 +491,7 @@
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_new(void)
@@ -532,6 +532,7 @@
}
}
+/** Like strmap_set() above but for digestmaps. */
void *
digestmap_set(digestmap_t *map, const char *key, void *val)
{
@@ -575,6 +576,7 @@
}
}
+/** Like strmap_get() above but for digestmaps. */
void *
digestmap_get(digestmap_t *map, const char *key)
{
@@ -618,6 +620,7 @@
}
}
+/** Like strmap_remove() above but for digestmaps. */
void *
digestmap_remove(digestmap_t *map, const char *key)
{
@@ -651,6 +654,7 @@
tor_free(lc_key);
return v;
}
+
/** Same as strmap_get, but first converts <b>key</b> to lowercase. */
void *
strmap_get_lc(strmap_t *map, const char *key)
@@ -662,6 +666,7 @@
tor_free(lc_key);
return v;
}
+
/** Same as strmap_remove, but first converts <b>key</b> to lowercase */
void *
strmap_remove_lc(strmap_t *map, const char *key)
@@ -836,7 +841,6 @@
{
return iter == NULL;
}
-
int
digestmap_iter_done(digestmap_iter_t *iter)
{
@@ -861,7 +865,6 @@
tor_assert(SPLAY_EMPTY(&map->head));
tor_free(map);
}
-
void
digestmap_free(digestmap_t *map, void (*free_val)(void*))
{
@@ -877,8 +880,7 @@
tor_free(map);
}
-/* Return true iff <b>map</b> has no entries.
- */
+/** Return true iff <b>map</b> has no entries. */
int
strmap_isempty(strmap_t *map)
{
Index: container.h
===================================================================
RCS file: /home2/or/cvsroot/tor/src/common/container.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- container.h 18 Oct 2005 20:11:39 -0000 1.22
+++ container.h 1 Nov 2005 03:47:55 -0000 1.23
@@ -125,7 +125,7 @@
void prefix##iter_get(prefix##iter_t *iter, keytype *keyp, void **valp); \
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(digestmap_t, const char *, digestmap_);
More information about the tor-commits
mailing list