From patchwork Mon Nov 17 18:32:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 5323121 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A9F41C11AC for ; Mon, 17 Nov 2014 18:32:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D42C02011D for ; Mon, 17 Nov 2014 18:32:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B0B8F20122 for ; Mon, 17 Nov 2014 18:32:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752173AbaKQScZ (ORCPT ); Mon, 17 Nov 2014 13:32:25 -0500 Received: from mail-qc0-f169.google.com ([209.85.216.169]:34010 "EHLO mail-qc0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751445AbaKQScZ (ORCPT ); Mon, 17 Nov 2014 13:32:25 -0500 Received: by mail-qc0-f169.google.com with SMTP id w7so3194066qcr.28 for ; Mon, 17 Nov 2014 10:32:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=BWO4cd0B4bveI+V1FPKG223xwdk87xsjjzx2RYWXjnc=; b=FwVM88VP9b/RV47DqA6eqg4pSCe/8PKuL+4mdDvVVZzcp/RZdPdZvWZClnIIJqdAUc idKbLsSSEozAft9B0YdXKGaiLnx4c3YloYXoBF68LM4hPD9GebEr4kc1KK+UVu/T55fC zHo6mfMacL2wM4+qIbu66280+ipX+hkZfAfNNPjYQTxGSRRwJC9H9wfVcjCXB2gNQ16x 9QELwdLGO2T+sKm30GFzI9KeRH6O0Jc8JOhBenVgB7rXxvXAAD+xVP5BYFy8Gu9egLhY AZfNJPAnOHM+swrIG1vftOSx3Xf0QDOQoPQD91l7MblOqb3FjvP/3rjcXb1edcEb8x/s c63g== X-Gm-Message-State: ALoCoQk0V4Ln7Q2J2zhpdS4KzjZDLjyLuCR4ZvyvNm4L27yEoLUlDwCc+5qUnaU8zBKN+cYymPQK X-Received: by 10.140.107.163 with SMTP id h32mr31207178qgf.34.1416249144707; Mon, 17 Nov 2014 10:32:24 -0800 (PST) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id r4sm34944223qan.31.2014.11.17.10.32.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Nov 2014 10:32:23 -0800 (PST) From: Jeff Layton To: chuck.lever@oracle.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH RFC 2/2] nfsdcltrack: use sqlite3_errmsg instead of sqlite3_errstr Date: Mon, 17 Nov 2014 13:32:15 -0500 Message-Id: <1416249135-18736-3-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1416249135-18736-1-git-send-email-jlayton@primarydata.com> References: <1416249135-18736-1-git-send-email-jlayton@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP sqlite3_errstr was only added in v3.7.15 of libsqlite3, which makes it difficult to build against earlier releases. Switch the code over to use sqlite3_errmsg instead. 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 7cac89ef459f..54cd7487920b 100644 --- a/utils/nfsdcltrack/sqlite.c +++ b/utils/nfsdcltrack/sqlite.c @@ -102,7 +102,7 @@ sqlite_query_schema_version(void) -1, &stmt, NULL); if (ret != SQLITE_OK) { xlog(L_ERROR, "Unable to prepare select statement: %s", - sqlite3_errstr(ret)); + sqlite3_errmsg(dbh)); ret = 0; goto out; } @@ -111,7 +111,7 @@ sqlite_query_schema_version(void) ret = sqlite3_step(stmt); if (ret != SQLITE_ROW) { xlog(L_ERROR, "Select statement execution failed: %s", - sqlite3_errstr(ret)); + sqlite3_errmsg(dbh)); ret = 0; goto out; } @@ -324,7 +324,7 @@ sqlite_prepare_dbh(const char *topdir) ret = sqlite3_busy_timeout(dbh, CLTRACK_SQLITE_BUSY_TIMEOUT); if (ret != SQLITE_OK) { xlog(L_ERROR, "Unable to set sqlite busy timeout: %s", - sqlite3_errstr(ret)); + sqlite3_errmsg(dbh)); goto out_close; } @@ -574,21 +574,21 @@ sqlite_query_reclaiming(const time_t grace_start) "time < ? OR has_session != 1", -1, &stmt, NULL); if (ret != SQLITE_OK) { xlog(L_ERROR, "%s: unable to prepare select statement: %s", - __func__, sqlite3_errstr(ret)); + __func__, sqlite3_errmsg(dbh)); return ret; } ret = sqlite3_bind_int64(stmt, 1, (sqlite3_int64)grace_start); if (ret != SQLITE_OK) { xlog(L_ERROR, "%s: bind int64 failed: %s", - __func__, sqlite3_errstr(ret)); + __func__, sqlite3_errmsg(dbh)); return ret; } ret = sqlite3_step(stmt); if (ret != SQLITE_ROW) { xlog(L_ERROR, "%s: unexpected return code from select: %s", - __func__, sqlite3_errstr(ret)); + __func__, sqlite3_errmsg(dbh)); return ret; }