forked from enlightenment/efl
parent
e43175fa37
commit
b76d9490dc
|
@ -585,7 +585,7 @@ efreet_ini_localestring_set(Efreet_Ini *ini, const char *key, const char *value)
|
||||||
if (country) maxlen += strlen(country);
|
if (country) maxlen += strlen(country);
|
||||||
if (modifier) maxlen += strlen(modifier);
|
if (modifier) maxlen += strlen(modifier);
|
||||||
|
|
||||||
buf = malloc(maxlen * sizeof(char));
|
buf = alloca(maxlen);
|
||||||
|
|
||||||
if (lang && modifier && country)
|
if (lang && modifier && country)
|
||||||
snprintf(buf, maxlen, "%s[%s_%s@%s]", key, lang, country, modifier);
|
snprintf(buf, maxlen, "%s[%s_%s@%s]", key, lang, country, modifier);
|
||||||
|
@ -596,10 +596,9 @@ efreet_ini_localestring_set(Efreet_Ini *ini, const char *key, const char *value)
|
||||||
else if (lang)
|
else if (lang)
|
||||||
snprintf(buf, maxlen, "%s[%s]", key, lang);
|
snprintf(buf, maxlen, "%s[%s]", key, lang);
|
||||||
else
|
else
|
||||||
return;
|
goto error;
|
||||||
|
|
||||||
efreet_ini_string_set(ini, buf, value);
|
efreet_ini_string_set(ini, buf, value);
|
||||||
FREE(buf);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1149,6 +1149,7 @@ efreet_mime_shared_mimeinfo_magic_parse(char *data, int size)
|
||||||
case '=':
|
case '=':
|
||||||
ptr++;
|
ptr++;
|
||||||
|
|
||||||
|
tshort = 0;
|
||||||
memcpy(&tshort, ptr, sizeof(short));
|
memcpy(&tshort, ptr, sizeof(short));
|
||||||
entry->value_len = ntohs(tshort);
|
entry->value_len = ntohs(tshort);
|
||||||
ptr += 2;
|
ptr += 2;
|
||||||
|
@ -1299,7 +1300,7 @@ efreet_mime_magic_check_priority(const char *file,
|
||||||
else if ((level > e->indent) && match)
|
else if ((level > e->indent) && match)
|
||||||
{
|
{
|
||||||
fclose(f);
|
fclose(f);
|
||||||
if (last_mime) return last_mime;
|
return last_mime;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (offset = e->offset; offset < e->offset + e->range_len; offset++)
|
for (offset = e->offset; offset < e->offset + e->range_len; offset++)
|
||||||
|
|
Loading…
Reference in New Issue