X-Git-Url: https://the.earth.li/gitweb/?p=onak.git;a=blobdiff_plain;f=hash.c;h=9357831ccc9b352fd3531f8afc4ebaf54df58700;hp=66ae5e54dccfbf3984b54c6807946c8024c8845b;hb=6d60149434eed130c201d4d670ce7b3be5c2866b;hpb=394938c479925750ffe56c28d281945ba4003a14 diff --git a/hash.c b/hash.c index 66ae5e5..9357831 100644 --- a/hash.c +++ b/hash.c @@ -1,9 +1,19 @@ /* * hash.c - hashing routines mainly used for caching key details. * - * Jonathan McDowell + * Copyright 2000-2002 Jonathan McDowell * - * Copyright 2000-2002 Project Purple + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . */ #include @@ -14,6 +24,7 @@ #include "keystructs.h" #include "ll.h" #include "mem.h" +#include "stats.h" /** * hashtable - the hash table array. @@ -25,6 +36,29 @@ static struct ll *hashtable[HASHSIZE]; */ static unsigned long elements; +/** + * free_statskey - free an stats key structure. + * @key: The key to free. + * + * Takes a stats key and frees the memory used by it and the linked list + * of sigs under it. Doesn't recurse into the list as it's assumed all the + * objects referenced also exist in the hash. + */ +static void free_statskey(struct stats_key *key) +{ + if (key != NULL) { + if (key->sigs != NULL) { + llfree(key->sigs, NULL); + key->sigs = NULL; + } + if (key->signs != NULL) { + llfree(key->signs, NULL); + key->signs = NULL; + } + free(key); + } +} + /** * inithash - Initialize the hash ready for use. */ @@ -99,7 +133,7 @@ struct stats_key *createandaddtohash(uint64_t keyid) return tmpkey; } -int stats_key_cmp(struct stats_key *key, uint64_t *keyid) +static int stats_key_cmp(struct stats_key *key, uint64_t *keyid) { return !(key != NULL && key->keyid == *keyid); }