From: Jeff Layton <jlayton@primarydata.com>
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 [thread overview]
Message-ID: <1416249135-18736-3-git-send-email-jlayton@primarydata.com> (raw)
In-Reply-To: <1416249135-18736-1-git-send-email-jlayton@primarydata.com>
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 <jlayton@primarydata.com>
---
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;
}
--
2.1.0
next prev parent reply other threads:[~2014-11-17 18:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-17 18:32 [PATCH RFC 0/2] nfsdcltrack: don't use libsqlite3 functions that are too new Jeff Layton
2014-11-17 18:32 ` [PATCH RFC 1/2] nfsdcltrack: use sqlite3_close instead of sqlite3_close_v2 Jeff Layton
2014-11-17 18:32 ` Jeff Layton [this message]
2014-11-17 19:04 ` [PATCH RFC 0/2] nfsdcltrack: don't use libsqlite3 functions that are too new Steve Dickson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1416249135-18736-3-git-send-email-jlayton@primarydata.com \
--to=jlayton@primarydata.com \
--cc=chuck.lever@oracle.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox