dict: K&R formatting cosmetics

pull/293/head
Patrice Clement 11 years ago committed by Diego Biurrun
parent d67dbfa7c1
commit 93d216d37a
  1. 32
      libavutil/dict.c

@ -35,21 +35,27 @@ int av_dict_count(const AVDictionary *m)
return m ? m->count : 0;
}
AVDictionaryEntry *
av_dict_get(AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags)
AVDictionaryEntry *av_dict_get(AVDictionary *m, const char *key,
const AVDictionaryEntry *prev, int flags)
{
unsigned int i, j;
if (!m)
return NULL;
if(prev) i= prev - m->elems + 1;
else i= 0;
if (prev)
i = prev - m->elems + 1;
else
i = 0;
for (; i < m->count; i++) {
const char *s = m->elems[i].key;
if(flags & AV_DICT_MATCH_CASE) for(j=0; s[j] == key[j] && key[j]; j++);
else for(j=0; av_toupper(s[j]) == av_toupper(key[j]) && key[j]; j++);
if (flags & AV_DICT_MATCH_CASE)
for (j = 0; s[j] == key[j] && key[j]; j++)
;
else
for (j = 0; av_toupper(s[j]) == av_toupper(key[j]) && key[j]; j++)
;
if (key[j])
continue;
if (s[j] && !(flags & AV_DICT_IGNORE_SUFFIX))
@ -59,7 +65,8 @@ av_dict_get(AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int
return NULL;
}
int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags)
int av_dict_set(AVDictionary **pm, const char *key, const char *value,
int flags)
{
AVDictionary *m = *pm;
AVDictionaryEntry *tag = av_dict_get(m, key, NULL, flags);
@ -78,16 +85,17 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags
av_free(tag->key);
*tag = m->elems[--m->count];
} else {
AVDictionaryEntry *tmp = av_realloc(m->elems, (m->count+1) * sizeof(*m->elems));
if(tmp) {
AVDictionaryEntry *tmp = av_realloc(m->elems,
(m->count + 1) * sizeof(*m->elems));
if (tmp)
m->elems = tmp;
} else
else
return AVERROR(ENOMEM);
}
if (value) {
if (flags & AV_DICT_DONT_STRDUP_KEY) {
if (flags & AV_DICT_DONT_STRDUP_KEY)
m->elems[m->count].key = key;
} else
else
m->elems[m->count].key = av_strdup(key);
if (flags & AV_DICT_DONT_STRDUP_VAL) {
m->elems[m->count].value = value;

Loading…
Cancel
Save