MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-24 03:27:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

[db] Refactor fetching query result into generic function

Browse Source 
Additionally changes the return value in case the end of the result set
is reached.
This commit is contained in:
chme
2021-12-28 06:55:35 +01:00
parent d7086cab00
commit a65ee4462e
9 changed files with 59 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mpd.c
View File

@@ -2317,7 +2317,7 @@ mpd_command_listplaylist(struct evbuffer *evbuf, int argc, char **argv, char **e
return ACK_ERROR_UNKNOWN;
}
while (((ret = db_query_fetch_file(&qp, &dbmfi)) == 0) && (dbmfi.id))
while ((ret = db_query_fetch_file(&qp, &dbmfi)) == 0)
{
evbuffer_add_printf(evbuf,
"file: %s\n",
@@ -2380,7 +2380,7 @@ mpd_command_listplaylistinfo(struct evbuffer *evbuf, int argc, char **argv, char
return ACK_ERROR_UNKNOWN;
}
while (((ret = db_query_fetch_file(&qp, &dbmfi)) == 0) && (dbmfi.id))
while ((ret = db_query_fetch_file(&qp, &dbmfi)) == 0)
{
ret = mpd_add_db_media_file_info(evbuf, &dbmfi);
if (ret < 0)
@@ -2672,7 +2672,7 @@ mpd_command_find(struct evbuffer *evbuf, int argc, char **argv, char **errmsg, s
return ACK_ERROR_UNKNOWN;
}
while (((ret = db_query_fetch_file(&qp, &dbmfi)) == 0) && (dbmfi.id))
while ((ret = db_query_fetch_file(&qp, &dbmfi)) == 0)
{
ret = mpd_add_db_media_file_info(evbuf, &dbmfi);
if (ret < 0)
@@ -2777,7 +2777,7 @@ mpd_command_list(struct evbuffer *evbuf, int argc, char **argv, char **errmsg, s
return ACK_ERROR_UNKNOWN;
}
while (((ret = db_query_fetch_file(&qp, &dbmfi)) == 0) && (dbmfi.id))
while ((ret = db_query_fetch_file(&qp, &dbmfi)) == 0)
{
strval = (char **) ((char *)&dbmfi + tagtype->mfi_offset);
@@ -2917,7 +2917,7 @@ mpd_add_directory(struct evbuffer *evbuf, int directory_id, int listall, int lis
*errmsg = safe_asprintf("Could not start query");
return ACK_ERROR_UNKNOWN;
}
while (((ret = db_query_fetch_file(&qp, &dbmfi)) == 0) && (dbmfi.id))
while ((ret = db_query_fetch_file(&qp, &dbmfi)) == 0)
{
if (listinfo)
{
@@ -3140,7 +3140,7 @@ mpd_command_search(struct evbuffer *evbuf, int argc, char **argv, char **errmsg,
return ACK_ERROR_UNKNOWN;
}
while (((ret = db_query_fetch_file(&qp, &dbmfi)) == 0) && (dbmfi.id))
while ((ret = db_query_fetch_file(&qp, &dbmfi)) == 0)
{
ret = mpd_add_db_media_file_info(evbuf, &dbmfi);
if (ret < 0)
@@ -3392,7 +3392,7 @@ mpd_sticker_find(struct evbuffer *evbuf, int argc, char **argv, char **errmsg, c
return ret;
}
while (((ret = db_query_fetch_file(&qp, &dbmfi)) == 0) && (dbmfi.id))
while ((ret = db_query_fetch_file(&qp, &dbmfi)) == 0)
{
ret = safe_atou32(dbmfi.rating, &rating);
if (ret < 0)