Merge branch 'release'

This commit is contained in:
David Bremner 2023-11-28 09:21:11 -04:00
commit 22eebce431

View file

@ -86,10 +86,14 @@ _notmuch_string_map_append (notmuch_string_map_t *map,
static int static int
cmppair (const void *pa, const void *pb) cmppair (const void *pa, const void *pb)
{ {
int cmp = 0;
notmuch_string_pair_t *a = (notmuch_string_pair_t *) pa; notmuch_string_pair_t *a = (notmuch_string_pair_t *) pa;
notmuch_string_pair_t *b = (notmuch_string_pair_t *) pb; notmuch_string_pair_t *b = (notmuch_string_pair_t *) pb;
return strcmp (a->key, b->key); cmp = strcmp (a->key, b->key);
if (cmp == 0)
cmp = strcmp (a->value, b->value);
return cmp;
} }
static void static void