X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fhtable%2F_info;h=ea11beb44003520ff137b27afc8fdae85551cae9;hb=b15b3673bf0fbbff48b87bddcf402b8bcdf41c59;hp=1553da2b0e85e7df8378da6e6e4cf2f9b8464dd8;hpb=0c3590dc33d644f73bb8587db454c491830aaf26;p=ccan diff --git a/ccan/htable/_info b/ccan/htable/_info index 1553da2b..ea11beb4 100644 --- a/ccan/htable/_info +++ b/ccan/htable/_info @@ -1,3 +1,4 @@ +#include "config.h" #include #include @@ -35,11 +36,12 @@ * // Wrapper for rehash function pointer. * static size_t rehash(const void *e, void *unused) * { + * (void)unused; * return hash_string(((struct name_to_digit *)e)->name); * } * * // Comparison function. - * static bool streq(const void *e, void *string) + * static bool nameeq(const void *e, void *string) * { * return strcmp(((struct name_to_digit *)e)->name, string) == 0; * } @@ -47,13 +49,13 @@ * // We let them add their own aliases, eg. --alias=v=5 * static void add_alias(struct htable *ht, const char *alias) * { - * char *eq; + * char *eq, *name; * struct name_to_digit *n; * * n = malloc(sizeof(*n)); - * n->name = strdup(alias); + * n->name = name = strdup(alias); * - * eq = strchr(n->name, '='); + * eq = strchr(name, '='); * if (!eq || ((n->val = atoi(eq+1)) == 0 && !strcmp(eq+1, "0"))) * errx(1, "Usage: --alias=="); * *eq = '\0'; @@ -63,7 +65,7 @@ * int main(int argc, char *argv[]) * { * struct htable ht; - * unsigned int i; + * int i; * unsigned long val; * * if (argc < 2) @@ -72,7 +74,7 @@ * * // Create and populate hash table. * htable_init(&ht, rehash, NULL); - * for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + * for (i = 0; i < (int)(sizeof(map)/sizeof(map[0])); i++) * htable_add(&ht, hash_string(map[i].name), &map[i]); * * // Add any aliases to the hash table. @@ -87,7 +89,7 @@ * for (val = 0; i < argc; i++) { * struct name_to_digit *n; * n = htable_get(&ht, hash_string(argv[i]), - * streq, argv[i]); + * nameeq, argv[i]); * if (!n) * errx(1, "Invalid digit name %s", argv[i]); * // Append it to the value we are building up. @@ -108,6 +110,7 @@ int main(int argc, char *argv[]) if (strcmp(argv[1], "depends") == 0) { printf("ccan/compiler\n"); + printf("ccan/str\n"); return 0; }