MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-02-26 21:09:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Let db_build_query_index_clause() always return an initialized idx, even on failure

Browse Source
This commit is contained in:
ejurgensen 2015-09-29 22:51:23 +02:00
parent cf70c514b6
commit 5125e24cfe
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/db.c
View File

@ -885,10 +885,12 @@ db_transaction_end(void)
/* Queries */ /* Queries */
static int static int
db_build_query_index_clause(struct query_params *qp, char **i) db_build_query_index_clause(char **i, struct query_params *qp)
{ {
char *idx; char *idx;
*i = NULL;
switch (qp->idx_type) switch (qp->idx_type)
{ {
case I_FIRST: case I_FIRST:
@ -904,7 +906,6 @@ db_build_query_index_clause(struct query_params *qp, char **i)
break; break;
case I_NONE: case I_NONE:
*i = NULL;
return 0; return 0;
default: default:
@ -951,8 +952,7 @@ db_build_query_items(struct query_params *qp, char **q)
return -1; return -1;
/* Get index clause */ /* Get index clause */
idx = NULL; ret = db_build_query_index_clause(&idx, qp);
ret = db_build_query_index_clause(qp, &idx);
if (ret < 0) if (ret < 0)
return -1; return -1;
@ -994,8 +994,7 @@ db_build_query_pls(struct query_params *qp, char **q)
return -1; return -1;
/* Get index clause */ /* Get index clause */
idx = NULL; ret = db_build_query_index_clause(&idx, qp);
ret = db_build_query_index_clause(qp, &idx);
if (ret < 0) if (ret < 0)
return -1; return -1;
@ -1053,8 +1052,7 @@ db_build_query_plitems_plain(struct query_params *qp, char **q)
return -1; return -1;
/* Get index clause */ /* Get index clause */
idx = NULL; ret = db_build_query_index_clause(&idx, qp);
ret = db_build_query_index_clause(qp, &idx);
if (ret < 0) if (ret < 0)
return -1; return -1;
@ -1119,8 +1117,7 @@ db_build_query_plitems_smart(struct query_params *qp, char *smartpl_query, char
return -1; return -1;
/* Get index clause */ /* Get index clause */
idx = NULL; ret = db_build_query_index_clause(&idx, qp);
ret = db_build_query_index_clause(qp, &idx);
if (ret < 0) if (ret < 0)
return -1; return -1;
@ -1197,8 +1194,7 @@ db_build_query_group_albums(struct query_params *qp, char **q)
return -1; return -1;
/* Get index clause */ /* Get index clause */
idx = NULL; ret = db_build_query_index_clause(&idx, qp);
ret = db_build_query_index_clause(qp, &idx);
if (ret < 0) if (ret < 0)
return -1; return -1;
@ -1240,8 +1236,7 @@ db_build_query_group_artists(struct query_params *qp, char **q)
return -1; return -1;
/* Get index clause */ /* Get index clause */
idx = NULL; ret = db_build_query_index_clause(&idx, qp);
ret = db_build_query_index_clause(qp, &idx);
if (ret < 0) if (ret < 0)
return -1; return -1;
@ -1436,8 +1431,7 @@ db_build_query_browse(struct query_params *qp, const char *field, const char *gr
return -1; return -1;
/* Get index clause */ /* Get index clause */
idx = NULL; ret = db_build_query_index_clause(&idx, qp);
ret = db_build_query_index_clause(qp, &idx);
if (ret < 0) if (ret < 0)
return -1; return -1;