MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-27 06:33:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename db_query_get_count() to db_get_count()

Browse Source 
Make that a generic helper, given it's used outside queries.
This commit is contained in:
Julien BLACHE 2009-06-11 15:45:49 +02:00
parent cef1636415
commit 267ab7cb1a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/db.c
View File

@ -356,10 +356,8 @@ db_purge_cruft(time_t ref)
} }
/* Queries */
static int static int
db_query_get_count(char *query) db_get_count(char *query)
{ {
sqlite3_stmt *stmt; sqlite3_stmt *stmt;
int ret; int ret;
@ -389,6 +387,8 @@ db_query_get_count(char *query)
return ret; return ret;
} }
/* Queries */
static int static int
db_build_query_index_clause(struct query_params *qp, char **i) db_build_query_index_clause(struct query_params *qp, char **i)
{ {
@ -448,7 +448,7 @@ db_build_query_items(struct query_params *qp, char **q)
return -1; return -1;
} }
qp->results = db_query_get_count(count); qp->results = db_get_count(count);
sqlite3_free(count); sqlite3_free(count);
if (qp->results < 0) if (qp->results < 0)
@ -486,7 +486,7 @@ db_build_query_pls(struct query_params *qp, char **q)
char *idx; char *idx;
int ret; int ret;
qp->results = db_query_get_count("SELECT COUNT(*) FROM playlists WHERE disabled = 0;"); qp->results = db_get_count("SELECT COUNT(*) FROM playlists WHERE disabled = 0;");
if (qp->results < 0) if (qp->results < 0)
return -1; return -1;
@ -549,7 +549,7 @@ db_build_query_plitems(struct query_params *qp, char **q)
return -1; return -1;
} }
qp->results = db_query_get_count(count); qp->results = db_get_count(count);
sqlite3_free(count); sqlite3_free(count);
if (qp->results < 0) if (qp->results < 0)
@ -610,7 +610,7 @@ db_build_query_browse(struct query_params *qp, char *field, char **q)
return -1; return -1;
} }
qp->results = db_query_get_count(count); qp->results = db_get_count(count);
sqlite3_free(count); sqlite3_free(count);
if (qp->results < 0) if (qp->results < 0)
@ -2452,7 +2452,7 @@ db_watch_cookie_known(uint32_t cookie)
return 0; return 0;
} }
ret = db_query_get_count(query); ret = db_get_count(query);
sqlite3_free(query); sqlite3_free(query);
@ -2631,7 +2631,7 @@ db_create_tables(void)
} }
} }
ret = db_query_get_count("SELECT COUNT(*) FROM playlists WHERE id = 1;"); ret = db_get_count("SELECT COUNT(*) FROM playlists WHERE id = 1;");
if (ret != 1) if (ret != 1)
{ {
DPRINTF(E_DBG, L_DB, "Creating default playlist\n"); DPRINTF(E_DBG, L_DB, "Creating default playlist\n");
@ -2646,7 +2646,7 @@ db_create_tables(void)
} }
} }
ret = db_query_get_count("SELECT COUNT(*) FROM admin WHERE key = 'schema_version';"); ret = db_get_count("SELECT COUNT(*) FROM admin WHERE key = 'schema_version';");
if (ret != 1) if (ret != 1)
{ {
DPRINTF(E_DBG, L_DB, "Setting schema version\n"); DPRINTF(E_DBG, L_DB, "Setting schema version\n");