oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

TagId3: gcc_unlikely instead of G_UNLIKELY

Browse Source
This commit is contained in:
Max Kellermann 2013-12-04 14:35:16 +01:00
parent 0c53e8c2d0
commit c6cf8e992d
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tag/TagId3.cxx
View File

@ -96,9 +96,8 @@ import_id3_string(bool is_id3v1, const id3_ucs4_t *ucs4)
if (is_id3v1 && if (is_id3v1 &&
(encoding = config_get_string(CONF_ID3V1_ENCODING, nullptr)) != nullptr) { (encoding = config_get_string(CONF_ID3V1_ENCODING, nullptr)) != nullptr) {
isostr = id3_ucs4_latin1duplicate(ucs4); isostr = id3_ucs4_latin1duplicate(ucs4);
if (G_UNLIKELY(!isostr)) { if (gcc_unlikely(isostr == nullptr))
return nullptr; return nullptr;
}
utf8 = (id3_utf8_t *) utf8 = (id3_utf8_t *)
g_convert_with_fallback((const char*)isostr, -1, g_convert_with_fallback((const char*)isostr, -1,
@ -115,10 +114,9 @@ import_id3_string(bool is_id3v1, const id3_ucs4_t *ucs4)
g_free(isostr); g_free(isostr);
} else { } else {
utf8 = id3_ucs4_utf8duplicate(ucs4); utf8 = id3_ucs4_utf8duplicate(ucs4);
if (G_UNLIKELY(!utf8)) { if (gcc_unlikely(utf8 == nullptr))
return nullptr; return nullptr;
} }
}
utf8_stripped = (id3_utf8_t *)g_strdup(g_strstrip((gchar *)utf8)); utf8_stripped = (id3_utf8_t *)g_strdup(g_strstrip((gchar *)utf8));
g_free(utf8); g_free(utf8);