From patchwork Thu Oct 25 17:21:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1646081 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id D5FE7DFB7E for ; Thu, 25 Oct 2012 17:21:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946159Ab2JYRV5 (ORCPT ); Thu, 25 Oct 2012 13:21:57 -0400 Received: from mail-vc0-f174.google.com ([209.85.220.174]:54466 "EHLO mail-vc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964972Ab2JYRVz (ORCPT ); Thu, 25 Oct 2012 13:21:55 -0400 Received: by mail-vc0-f174.google.com with SMTP id fk26so2132436vcb.19 for ; Thu, 25 Oct 2012 10:21:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=d6khH+EOhcxUvaYqmenzEutkDuq9BSIhR7JR4OvvozI=; b=Aprcuv+/PLmuRFeQmzYBsSpDMdZq+SksPBG73lisrU9Z0zwlrT3OQrOXpyKxkLW7Bl h6BlTbmokbj5o5GAeZQ0tm4EqfTrVl7dGn1zI1v/MTYKLBAzBlBE2nSnC48S5yhWX8Iq JBjVfUgD/llQVEL425zxj4+TOJRWIeGBmFf+MrPfjc13Y9H5B5M5AufDr4E89DtbhbP6 uKPR0379EKdYr9cC5VnYxvhAV423yp3PSEojOY0njtKedXubkpnKZeI1zNXVL75SjKXW NQ0/pFV0oc4+vwTulmA5qKkmh0uW/FJAeSiwgzFhihGpy16lJhcxQZ6E6RCpr5Ih54pa yTJA== Received: by 10.220.157.75 with SMTP id a11mr15505542vcx.27.1351185714104; Thu, 25 Oct 2012 10:21:54 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-107-015-110-129.nc.res.rr.com. [107.15.110.129]) by mx.google.com with ESMTPS id k4sm19373961vdg.2.2012.10.25.10.21.52 (version=SSLv3 cipher=OTHER); Thu, 25 Oct 2012 10:21:53 -0700 (PDT) From: Jeff Layton To: steved@redhat.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH v3 3/9] nfsdcltrack: remove pointless sqlite_topdir variable Date: Thu, 25 Oct 2012 13:21:37 -0400 Message-Id: <1351185703-14191-4-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1351185703-14191-1-git-send-email-jlayton@redhat.com> References: <1351185703-14191-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQntT6i3lPh8BXc3VhP7VGEC4R4Q+Z7LVnwxMpTdPaZeZRilMfQpXNR63MhErgQn2u7HfOSK Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org 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 --- utils/nfsdcltrack/sqlite.c | 13 ++++--------- utils/nfsdcltrack/sqlite.h | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) 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);