From 7a3b97bf1d1b53c9c6454515fb8cdbd51de71950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Mon, 8 Sep 2008 00:25:47 +0200 Subject: - Put db_path into musicfs.h - Got ride of some warnings --- include/musicfs.h | 4 ++++ src/mfs_cleanup_db.c | 6 ++---- src/mfs_subr.c | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/musicfs.h b/include/musicfs.h index d3d399f..e484e00 100644 --- a/include/musicfs.h +++ b/include/musicfs.h @@ -28,6 +28,10 @@ struct fuse_args; int mfs_run(int, char **); int mfs_init(); +/* + * The path to the sqlite database + */ +char *db_path; /* * Functions traversing the underlying filesystem and do operations on the diff --git a/src/mfs_cleanup_db.c b/src/mfs_cleanup_db.c index 1dac260..e4eb70b 100644 --- a/src/mfs_cleanup_db.c +++ b/src/mfs_cleanup_db.c @@ -26,8 +26,6 @@ #include #include -extern char *db_path; - void mfs_delete_from_path(sqlite3 *handle, const char *path) { sqlite3_stmt *st; @@ -63,8 +61,8 @@ mfs_cleanup_db(sqlite3 *handle) { DEBUG("cleaning up db\n"); /* sqlite doesn't support deleting from multiple tables at the same time :-( */ - sqlite3_stmt *st, *st_; - int res, res_; + sqlite3_stmt *st; + int res; const char *path; diff --git a/src/mfs_subr.c b/src/mfs_subr.c index c669497..c6f2c7f 100644 --- a/src/mfs_subr.c +++ b/src/mfs_subr.c @@ -60,7 +60,6 @@ struct lookuphandle { lookup_fn_t *lookup; }; -char *db_path; sqlite3 *handle; pthread_mutex_t dblock; pthread_mutex_t __debug_lock__; -- cgit v1.2.3