MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-28 08:05:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #304 from chme/cleanup

Browse Source 
Minor cleanup of mdns and dacp
This commit is contained in:
ejurgensen 2016-11-04 19:17:17 +01:00 committed by GitHub
commit 33c22a59b9
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/httpd_dacp.c
View File

@ -796,7 +796,7 @@ find_first_song_id(const char *query)
qp.filter = daap_query_parse_sql(query); qp.filter = daap_query_parse_sql(query);
if (!qp.filter) if (!qp.filter)
{ {
DPRINTF(E_LOG, L_PLAYER, "Improper DAAP query!\n"); DPRINTF(E_LOG, L_DACP, "Improper DAAP query!\n");
return -1; return -1;
} }
@ -804,7 +804,7 @@ find_first_song_id(const char *query)
ret = db_query_start(&qp); ret = db_query_start(&qp);
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_LOG, L_PLAYER, "Could not start query\n"); DPRINTF(E_LOG, L_DACP, "Could not start query\n");
goto no_query_start; goto no_query_start;
} }
@ -814,17 +814,17 @@ find_first_song_id(const char *query)
ret = safe_atoi32(dbmfi.id, &id); ret = safe_atoi32(dbmfi.id, &id);
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_LOG, L_PLAYER, "Invalid song id in query result!\n"); DPRINTF(E_LOG, L_DACP, "Invalid song id in query result!\n");
goto no_result; goto no_result;
} }
DPRINTF(E_DBG, L_PLAYER, "Found index song (id %d)\n", id); DPRINTF(E_DBG, L_DACP, "Found index song (id %d)\n", id);
ret = 1; ret = 1;
} }
else else
{ {
DPRINTF(E_LOG, L_PLAYER, "No song matches query (results %d): %s\n", qp.results, qp.filter); DPRINTF(E_LOG, L_DACP, "No song matches query (results %d): %s\n", qp.results, qp.filter);
goto no_result; goto no_result;
} }
@ -895,7 +895,7 @@ dacp_queueitem_make(struct queue_item **head, const char *query, const char *que
ret = safe_atoi64(strchr(queuefilter, ':') + 1, &albumid); ret = safe_atoi64(strchr(queuefilter, ':') + 1, &albumid);
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_LOG, L_PLAYER, "Invalid album id in queuefilter: %s\n", queuefilter); DPRINTF(E_LOG, L_DACP, "Invalid album id in queuefilter: %s\n", queuefilter);
return -1; return -1;
} }
@ -908,7 +908,7 @@ dacp_queueitem_make(struct queue_item **head, const char *query, const char *que
ret = safe_atoi64(strchr(queuefilter, ':') + 1, &artistid); ret = safe_atoi64(strchr(queuefilter, ':') + 1, &artistid);
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_LOG, L_PLAYER, "Invalid artist id in queuefilter: %s\n", queuefilter); DPRINTF(E_LOG, L_DACP, "Invalid artist id in queuefilter: %s\n", queuefilter);
return -1; return -1;
} }
@ -921,7 +921,7 @@ dacp_queueitem_make(struct queue_item **head, const char *query, const char *que
ret = safe_atoi32(strchr(queuefilter, ':') + 1, &plid); ret = safe_atoi32(strchr(queuefilter, ':') + 1, &plid);
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_LOG, L_PLAYER, "Invalid playlist id in queuefilter: %s\n", queuefilter); DPRINTF(E_LOG, L_DACP, "Invalid playlist id in queuefilter: %s\n", queuefilter);
return -1; return -1;
} }
@ -939,7 +939,7 @@ dacp_queueitem_make(struct queue_item **head, const char *query, const char *que
} }
else else
{ {
DPRINTF(E_LOG, L_PLAYER, "Unknown queuefilter %s\n", queuefilter); DPRINTF(E_LOG, L_DACP, "Unknown queuefilter %s\n", queuefilter);
// If the queuefilter is unkown, ignore it and use the query parameter instead to build the sql query // If the queuefilter is unkown, ignore it and use the query parameter instead to build the sql query
id = 0; id = 0;

4
src/mdns_avahi.c
View File

@ -392,7 +392,7 @@ avahi_address_make(AvahiAddress *addr, AvahiProtocol proto, const void *rdata, s
{ {
if (size != sizeof(AvahiIPv4Address)) if (size != sizeof(AvahiIPv4Address))
{ {
DPRINTF(E_LOG, L_MDNS, "Got RR type A size %d (should be %d)\n", size, sizeof(AvahiIPv4Address)); DPRINTF(E_LOG, L_MDNS, "Got RR type A size %zu (should be %zu)\n", size, sizeof(AvahiIPv4Address));
return -1; return -1;
} }
@ -404,7 +404,7 @@ avahi_address_make(AvahiAddress *addr, AvahiProtocol proto, const void *rdata, s
{ {
if (size != sizeof(AvahiIPv6Address)) if (size != sizeof(AvahiIPv6Address))
{ {
DPRINTF(E_LOG, L_MDNS, "Got RR type AAAA size %d (should be %d)\n", size, sizeof(AvahiIPv6Address)); DPRINTF(E_LOG, L_MDNS, "Got RR type AAAA size %zu (should be %zu)\n", size, sizeof(AvahiIPv6Address));
return -1; return -1;
} }