diff options
| author | Jeff Layton <jlayton@primarydata.com> | 2014-11-17 13:59:41 -0500 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2014-11-17 13:59:41 -0500 |
| commit | 72819502650d39e7791adebe737a6d04124d9ef3 (patch) | |
| tree | 671911ce40415307767ed865696f98b707c54c2a /utils/nfsdcltrack | |
| parent | caf2c4070dd62351f224a01735f5489830643fbf (diff) | |
| download | nfs-utils-72819502650d39e7791adebe737a6d04124d9ef3.tar.gz | |
nfsdcltrack: use sqlite3_errmsg instead of sqlite3_errstr
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>
Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'utils/nfsdcltrack')
| -rw-r--r-- | utils/nfsdcltrack/sqlite.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c index 7cac89e..54cd748 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; } |