git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
47cbf11ec7af6e1cdd6768e1e356da515a9747ce blob 3064 bytes (raw)

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
 
#include "git-compat-util.h"
#include "strmap.h"

static int cmp_strmap_entry(const void *hashmap_cmp_fn_data,
			    const struct hashmap_entry *entry1,
			    const struct hashmap_entry *entry2,
			    const void *keydata)
{
	const struct strmap_entry *e1, *e2;

	e1 = container_of(entry1, const struct strmap_entry, ent);
	e2 = container_of(entry2, const struct strmap_entry, ent);
	return strcmp(e1->key, e2->key);
}

static struct strmap_entry *find_strmap_entry(struct strmap *map,
					      const char *str)
{
	struct strmap_entry entry;
	hashmap_entry_init(&entry.ent, strhash(str));
	entry.key = str;
	return hashmap_get_entry(&map->map, &entry, ent, NULL);
}

void strmap_init(struct strmap *map)
{
	strmap_ocd_init(map, 1);
}

void strmap_ocd_init(struct strmap *map,
		     int strdup_strings)
{
	hashmap_init(&map->map, cmp_strmap_entry, NULL, 0);
	map->strdup_strings = strdup_strings;
}

static void strmap_free_entries_(struct strmap *map, int free_util)
{
	struct hashmap_iter iter;
	struct strmap_entry *e;

	if (!map)
		return;

	/*
	 * We need to iterate over the hashmap entries and free
	 * e->key and e->value ourselves; hashmap has no API to
	 * take care of that for us.  Since we're already iterating over
	 * the hashmap, though, might as well free e too and avoid the need
	 * to make some call into the hashmap API to do that.
	 */
	hashmap_for_each_entry(&map->map, &iter, e, ent) {
		if (free_util)
			free(e->value);
		if (map->strdup_strings)
			free((char*)e->key);
		free(e);
	}
}

void strmap_clear(struct strmap *map, int free_util)
{
	strmap_free_entries_(map, free_util);
	hashmap_free(&map->map);
}

void strmap_partial_clear(struct strmap *map, int free_util)
{
	strmap_free_entries_(map, free_util);
	hashmap_partial_clear(&map->map);
}

void *strmap_put(struct strmap *map, const char *str, void *data)
{
	struct strmap_entry *entry = find_strmap_entry(map, str);
	void *old = NULL;

	if (entry) {
		old = entry->value;
		entry->value = data;
	} else {
		/*
		 * We won't modify entry->key so it really should be const.
		 */
		const char *key = str;

		entry = xmalloc(sizeof(*entry));
		hashmap_entry_init(&entry->ent, strhash(str));

		if (map->strdup_strings)
			key = xstrdup(str);
		entry->key = key;
		entry->value = data;
		hashmap_add(&map->map, &entry->ent);
	}
	return old;
}

struct strmap_entry *strmap_get_entry(struct strmap *map, const char *str)
{
	return find_strmap_entry(map, str);
}

void *strmap_get(struct strmap *map, const char *str)
{
	struct strmap_entry *entry = find_strmap_entry(map, str);
	return entry ? entry->value : NULL;
}

int strmap_contains(struct strmap *map, const char *str)
{
	return find_strmap_entry(map, str) != NULL;
}

void strmap_remove(struct strmap *map, const char *str, int free_util)
{
	struct strmap_entry entry, *ret;
	hashmap_entry_init(&entry.ent, strhash(str));
	entry.key = str;
	ret = hashmap_remove_entry(&map->map, &entry, ent, NULL);
	if (!ret)
		return;
	if (free_util)
		free(ret->value);
	if (map->strdup_strings)
		free((char*)ret->key);
	free(ret);
}
debug log:

solving 47cbf11ec7 ...
found 47cbf11ec7 in https://public-inbox.org/git/2ebce0c5d82b87fa9c9ef5dcefc0ac2701654f3b.1602549650.git.gitgitgadget@gmail.com/
found 909b9fbedf in https://public-inbox.org/git/61b5bf11103a7bd12de8fd066e128c469da3a0a4.1602549650.git.gitgitgadget@gmail.com/
found 4b48d64274 in https://public-inbox.org/git/5c7507f55b09e24c0bfe87cc3df06213cfd1235b.1602549650.git.gitgitgadget@gmail.com/

applying [1/3] https://public-inbox.org/git/5c7507f55b09e24c0bfe87cc3df06213cfd1235b.1602549650.git.gitgitgadget@gmail.com/
diff --git a/strmap.c b/strmap.c
new file mode 100644
index 0000000000..4b48d64274


applying [2/3] https://public-inbox.org/git/61b5bf11103a7bd12de8fd066e128c469da3a0a4.1602549650.git.gitgitgadget@gmail.com/
diff --git a/strmap.c b/strmap.c
index 4b48d64274..909b9fbedf 100644


applying [3/3] https://public-inbox.org/git/2ebce0c5d82b87fa9c9ef5dcefc0ac2701654f3b.1602549650.git.gitgitgadget@gmail.com/
diff --git a/strmap.c b/strmap.c
index 909b9fbedf..47cbf11ec7 100644

Checking patch strmap.c...
Applied patch strmap.c cleanly.
Checking patch strmap.c...
Applied patch strmap.c cleanly.
Checking patch strmap.c...
Applied patch strmap.c cleanly.

index at:
100644 47cbf11ec7af6e1cdd6768e1e356da515a9747ce	strmap.c

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).