Terminate last line in setfilter help

[solanum.git] / bandb / rsdb_sqlite3.c

diff --git a/bandb/rsdb_sqlite3.c b/bandb/rsdb_sqlite3.c
index 77903200fce85ce95818a0a5781c46434c0e440e..97eff0e6495fa1d30458c9a7421eb2ab59b20015 100644 (file)
--- a/bandb/rsdb_sqlite3.c
+++ b/bandb/rsdb_sqlite3.c
@@ -27,8 +27,6 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id: rsdb_sqlite3.c 26182 2008-11-11 02:52:41Z androsyn $
  */
 #include "stdinc.h"
 #include "rsdb.h"
@@ -47,7 +45,7 @@ mlog(const char *errstr, ...)
                char buf[256];
                va_list ap;
                va_start(ap, errstr);
-               rb_vsnprintf(buf, sizeof(buf), errstr, ap);
+               vsnprintf(buf, sizeof(buf), errstr, ap);
                va_end(ap);
                error_cb(buf);
        }
@@ -73,14 +71,14 @@ rsdb_init(rsdb_error_cb * ecb)
 
        if(sqlite3_open(dbpath, &rb_bandb) != SQLITE_OK)
        {
-               rb_snprintf(errbuf, sizeof(errbuf), "Unable to open sqlite database: %s",
+               snprintf(errbuf, sizeof(errbuf), "Unable to open sqlite database: %s",
                            sqlite3_errmsg(rb_bandb));
                mlog(errbuf);
                return -1;
        }
        if(access(dbpath, W_OK))
        {
-               rb_snprintf(errbuf, sizeof(errbuf),  "Unable to open sqlite database for write: %s", strerror(errno));
+               snprintf(errbuf, sizeof(errbuf),  "Unable to open sqlite database for write: %s", strerror(errno));
                mlog(errbuf);
                return -1;
        }
@@ -120,7 +118,7 @@ static int
 rsdb_callback_func(void *cbfunc, int argc, char **argv, char **colnames)
 {
        rsdb_callback cb = (rsdb_callback)((uintptr_t)cbfunc);
-       (cb) (argc, (const char **)argv);
+       (cb) (argc, (const char **)(void *)argv);
        return 0;
 }