p
/
nncmpp
1
1
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Factor out mpd_parse_kv()

This commit is contained in:
Přemysl Eric Janouch 2016-10-13 01:48:45 +02:00
parent 62a08ad4d3
commit a8deb3c218
Signed by: p
GPG Key ID: B715679E3A361BE6
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nncmpp.c
View File

@ -209,6 +209,14 @@ print_curl_debug (CURL *easy, curl_infotype type, char *data, size_t len,
return 0; return 0;
} }
static char *
mpd_parse_kv (char *line, char **value)
{
char *key = mpd_client_parse_kv (line, value);
if (!key) print_debug ("%s: %s", "erroneous MPD output", line);
return key;
}
// --- cURL async wrapper ------------------------------------------------------ // --- cURL async wrapper ------------------------------------------------------
// You are meant to subclass this structure, no user_data pointers needed // You are meant to subclass this structure, no user_data pointers needed
@ -2145,8 +2153,8 @@ library_tab_on_data (const struct mpd_response *response,
char *key, *value, type; char *key, *value, type;
for (size_t i = data->len; i--; ) for (size_t i = data->len; i--; )
if (!(key = mpd_client_parse_kv (data->vector[i], &value))) if (!(key = mpd_parse_kv (data->vector[i], &value)))
print_debug ("%s: %s", "erroneous MPD output", data->vector[i]); continue;
else if (!(type = library_tab_header_type (key))) else if (!(type = library_tab_header_type (key)))
str_map_set (&map, key, value); str_map_set (&map, key, value);
else else
@ -2743,11 +2751,8 @@ mpd_process_info (const struct str_vector *data)
unsigned long n; char *key, *value; unsigned long n; char *key, *value;
for (size_t i = 0; i < data->len - 1 && data->vector[i]; i++) for (size_t i = 0; i < data->len - 1 && data->vector[i]; i++)
{ {
if (!(key = mpd_client_parse_kv (data->vector[i], &value))) if (!(key = mpd_parse_kv (data->vector[i], &value)))
{
print_debug ("%s: %s", "erroneous MPD output", data->vector[i]);
continue; continue;
}
if (!strcasecmp_ascii (key, "playlistlength") if (!strcasecmp_ascii (key, "playlistlength")
&& xstrtoul (&n, value, 10)) && xstrtoul (&n, value, 10))
item_list_resize (&g_ctx.playlist, n); item_list_resize (&g_ctx.playlist, n);
@ -2760,11 +2765,8 @@ mpd_process_info (const struct str_vector *data)
map.key_xfrm = tolower_ascii_strxfrm; map.key_xfrm = tolower_ascii_strxfrm;
for (size_t i = data->len - 1; i-- && data->vector[i]; ) for (size_t i = data->len - 1; i-- && data->vector[i]; )
{ {
if (!(key = mpd_client_parse_kv (data->vector[i], &value))) if (!(key = mpd_parse_kv (data->vector[i], &value)))
{
print_debug ("%s: %s", "erroneous MPD output", data->vector[i]);
continue; continue;
}
str_map_set (&map, key, value); str_map_set (&map, key, value);
if (!strcasecmp_ascii (key, "file")) if (!strcasecmp_ascii (key, "file"))
{ {