From 1a0020edd06dde37f3ad7168f141645f07a050c7 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Thu, 8 Nov 2012 14:39:28 -0500 Subject: nfsdcltrack: remove pointless sqlite_topdir variable This is holdover from an earlier version of the code and doesn't really provide any benefit. Also, mark the topdir and dirname arguments const since they should never be changed. Signed-off-by: Jeff Layton Signed-off-by: Steve Dickson --- utils/nfsdcltrack/nfsdcld | Bin 64142 -> 64072 bytes utils/nfsdcltrack/sqlite.c | 13 ++++--------- utils/nfsdcltrack/sqlite.h | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/utils/nfsdcltrack/nfsdcld b/utils/nfsdcltrack/nfsdcld index 47801fc..651b0c3 100755 Binary files a/utils/nfsdcltrack/nfsdcld and b/utils/nfsdcltrack/nfsdcld differ diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c index fc882c6..c19af7e 100644 --- a/utils/nfsdcltrack/sqlite.c +++ b/utils/nfsdcltrack/sqlite.c @@ -61,9 +61,6 @@ /* global variables */ -/* top level DB directory */ -static char *sqlite_topdir; - /* reusable pathname and sql command buffer */ static char buf[PATH_MAX]; @@ -74,7 +71,7 @@ static sqlite3 *dbh; /* make a directory, ignoring EEXIST errors unless it's not a directory */ static int -mkdir_if_not_exist(char *dirname) +mkdir_if_not_exist(const char *dirname) { int ret; struct stat statbuf; @@ -102,19 +99,17 @@ mkdir_if_not_exist(char *dirname) * the "clients" table. */ int -sqlite_maindb_init(char *topdir) +sqlite_maindb_init(const char *topdir) { int ret; char *err = NULL; sqlite3_stmt *stmt = NULL; - sqlite_topdir = topdir; - - ret = mkdir_if_not_exist(sqlite_topdir); + ret = mkdir_if_not_exist(topdir); if (ret) return ret; - ret = snprintf(buf, PATH_MAX - 1, "%s/main.sqlite", sqlite_topdir); + ret = snprintf(buf, PATH_MAX - 1, "%s/main.sqlite", topdir); if (ret < 0) return ret; diff --git a/utils/nfsdcltrack/sqlite.h b/utils/nfsdcltrack/sqlite.h index c85e7d6..8748948 100644 --- a/utils/nfsdcltrack/sqlite.h +++ b/utils/nfsdcltrack/sqlite.h @@ -20,7 +20,7 @@ #ifndef _SQLITE_H_ #define _SQLITE_H_ -int sqlite_maindb_init(char *topdir); +int sqlite_maindb_init(const char *topdir); int sqlite_insert_client(const unsigned char *clname, const size_t namelen); int sqlite_remove_client(const unsigned char *clname, const size_t namelen); int sqlite_check_client(const unsigned char *clname, const size_t namelen); -- cgit v1.2.1