storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fix race condition with file-serving SQL queries and scanner/inotify SQL queries.

Browse Source
This commit is contained in:
Justin Maggard
2009-03-22 22:21:44 +00:00
parent c4d180f80d
commit 575556ca9d
3 changed files with 107 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql.c
View File

@ -17,18 +17,19 @@
*/
#include <stdio.h>
#include "sql.h"
#include "log.h"
int
sql_exec(sqlite3 * db, const char * sql)
{
int ret;
char *errMsg = NULL;
//DEBUG printf("SQL: %s\n", sql);
//DPRINTF(E_DEBUG, L_DB_SQL, "SQL: %s\n", sql);
ret = sqlite3_exec(db, sql, 0, 0, &errMsg);
if( ret != SQLITE_OK )
{
fprintf(stderr, "SQL ERROR %d [%s]\n%s\n", ret, errMsg, sql);
DPRINTF(E_ERROR, L_DB_SQL, "SQL ERROR %d [%s]\n%s\n", ret, errMsg, sql);
if (errMsg)
sqlite3_free(errMsg);
}
@ -40,12 +41,12 @@ sql_get_table(sqlite3 *db, const char *sql, char ***pazResult, int *pnRow, int *
{
int ret;
char *errMsg = NULL;
//DEBUG printf("SQL: %s\n", sql);
//DPRINTF(E_DEBUG, L_DB_SQL, "SQL: %s\n", sql);
ret = sqlite3_get_table(db, sql, pazResult, pnRow, pnColumn, &errMsg);
if( ret != SQLITE_OK )
{
fprintf(stderr, "SQL ERROR %d [%s]\n%s\n", ret, errMsg, sql);
DPRINTF(E_ERROR, L_DB_SQL, "SQL ERROR %d [%s]\n%s\n", ret, errMsg, sql);
if (errMsg)
sqlite3_free(errMsg);
}