Return-Path: linux-nfs-owner@vger.kernel.org Received: from mail-qc0-f179.google.com ([209.85.216.179]:46124 "EHLO mail-qc0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756485AbaISNxB (ORCPT ); Fri, 19 Sep 2014 09:53:01 -0400 Received: by mail-qc0-f179.google.com with SMTP id x13so3090697qcv.24 for ; Fri, 19 Sep 2014 06:53:01 -0700 (PDT) From: Jeff Layton To: steved@redhat.com Cc: bfields@fieldses.org, linux-nfs@vger.kernel.org Subject: [PATCH v5 3/7] nfsdcltrack: rename CLD_* constants with CLTRACK_* prefixes Date: Fri, 19 Sep 2014 09:52:46 -0400 Message-Id: <1411134770-2409-4-git-send-email-jlayton@primarydata.com> In-Reply-To: <1411134770-2409-1-git-send-email-jlayton@primarydata.com> References: <1411134770-2409-1-git-send-email-jlayton@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: From: Jeff Layton Since nfsdcld has been dead for a few years now, clean up the prefixes on the constants. Signed-off-by: Jeff Layton --- utils/nfsdcltrack/sqlite.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c index 352f029d55c0..1c8d935b3d41 100644 --- a/utils/nfsdcltrack/sqlite.c +++ b/utils/nfsdcltrack/sqlite.c @@ -50,10 +50,10 @@ #include "xlog.h" -#define CLD_SQLITE_SCHEMA_VERSION 1 +#define CLTRACK_SQLITE_LATEST_SCHEMA_VERSION 1 /* in milliseconds */ -#define CLD_SQLITE_BUSY_TIMEOUT 10000 +#define CLTRACK_SQLITE_BUSY_TIMEOUT 10000 /* private data structures */ @@ -111,7 +111,7 @@ sqlite_prepare_dbh(const char *topdir) return ret; } - ret = sqlite3_busy_timeout(dbh, CLD_SQLITE_BUSY_TIMEOUT); + ret = sqlite3_busy_timeout(dbh, CLTRACK_SQLITE_BUSY_TIMEOUT); if (ret != SQLITE_OK) { xlog(L_ERROR, "Unable to set sqlite busy timeout: %d", ret); sqlite3_close(dbh); @@ -156,7 +156,7 @@ sqlite_maindb_init(const char *topdir) /* insert version into table -- ignore error if it fails */ ret = snprintf(buf, sizeof(buf), "INSERT OR IGNORE INTO parameters values (\"version\", " - "\"%d\");", CLD_SQLITE_SCHEMA_VERSION); + "\"%d\");", CLTRACK_SQLITE_LATEST_SCHEMA_VERSION); if (ret < 0) { goto out_err; } else if ((size_t)ret >= sizeof(buf)) { @@ -189,10 +189,10 @@ sqlite_maindb_init(const char *topdir) /* process SELECT result */ ret = sqlite3_column_int(stmt, 0); - if (ret != CLD_SQLITE_SCHEMA_VERSION) { + if (ret != CLTRACK_SQLITE_LATEST_SCHEMA_VERSION) { xlog(L_ERROR, "Unsupported database schema version! " "Expected %d, got %d.", - CLD_SQLITE_SCHEMA_VERSION, ret); + CLTRACK_SQLITE_LATEST_SCHEMA_VERSION, ret); ret = -EINVAL; goto out_err; } -- 1.9.3