Commits

Alexandre Carmel-Veilleux committed f5daf78

SVN support no longer relies on sqlite3_errstr
This removes dependency on sqlite3 >= 3.7.15, RHEL6 compat.

  • Participants
  • Parent commits 41e0e01

Comments (0)

Files changed (1)

 
     retval = sqlite3_open_v2(".svn/wc.db", &conn, SQLITE_OPEN_READONLY, NULL);
     if (retval != SQLITE_OK) {
-        debug("error opening database in .svn/wc.db: %s", sqlite3_errstr(retval));
+        debug("error opening database in .svn/wc.db: %s", sqlite3_errmsg(conn));
         goto err;
     }
     // unclear when wc_id is anything other than 1
     const char *textval;
     retval = sqlite3_prepare_v2(conn, sql, strlen(sql), &res, &tail);
     if (retval != SQLITE_OK) {
-        debug("error running query: %s", sqlite3_errstr(retval));
+        debug("error running query: %s", sqlite3_errmsg(conn));
         goto err;
     }
     retval = sqlite3_step(res);
     if (retval != SQLITE_DONE && retval != SQLITE_ROW) {
-        debug("error fetching result row: %s", sqlite3_errstr(retval));
+        debug("error fetching result row: %s", sqlite3_errmsg(conn));
         goto err;
     }
     textval = (const char *) sqlite3_column_text(res, 0);
     sql = "select repos_path from nodes where local_relpath = ?";
     retval = sqlite3_prepare_v2(conn, sql, strlen(sql), &res, &tail);
     if (retval != SQLITE_OK) {
-        debug("error querying for repos_path: %s", sqlite3_errstr(retval));
+        debug("error querying for repos_path: %s", sqlite3_errmsg(conn));
         goto err;
     }
     retval = sqlite3_bind_text(res, 1,
                                context->rel_path, strlen(context->rel_path),
                                SQLITE_STATIC);
     if (retval != SQLITE_OK) {
-        debug("error binding parameter: %s", sqlite3_errstr(retval));
+        debug("error binding parameter: %s", sqlite3_errmsg(conn));
         goto err;
     }
     retval = sqlite3_step(res);
     if (retval != SQLITE_DONE && retval != SQLITE_ROW) {
-        debug("error fetching result row: %s", sqlite3_errstr(retval));
+        debug("error fetching result row: %s", sqlite3_errmsg(conn));
         goto err;
     }