From dc30b84bb9c3759bcfee5e6d162395cad9873465 Mon Sep 17 00:00:00 2001
From: zecke <zecke>
Date: Mon, 30 Aug 2004 13:31:01 +0000
Subject: Fix warnings, add sanity check, new default argument to fix warning...

---
(limited to 'libopie2/opiedb/osqlitedriver.cpp')

diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp
index 92f89cf..c8b560f 100644
--- a/libopie2/opiedb/osqlitedriver.cpp
+++ b/libopie2/opiedb/osqlitedriver.cpp
@@ -36,8 +36,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-namespace Opie { 
-namespace DB { 
+namespace Opie {
+namespace DB {
 namespace Internal {
 
 namespace {
@@ -104,7 +104,7 @@ int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){
 }
 
 void rlikeFunc(sqlite_func *context, int arg, const char **argv){
-    if( argv[0]==0 || argv[1]==0 ){
+    if( arg < 2 || argv[0]==0 || argv[1]==0 ){
         printf("One of arguments Null!!\n");
         return;
     }
@@ -120,7 +120,7 @@ void rlikeFunc(sqlite_func *context, int arg, const char **argv){
 bool OSQLiteDriver::open() {
     char *error;
 
-    odebug << "OSQLiteDriver::open: about to open" << oendl; 
+    odebug << "OSQLiteDriver::open: about to open" << oendl;
     m_sqlite = sqlite_open(m_url.local8Bit(),
                            0,
                            &error );
@@ -128,7 +128,7 @@ bool OSQLiteDriver::open() {
     /* failed to open */
     if (m_sqlite == 0l ) {
         // FIXME set the last error
-        owarn << "OSQLiteDriver::open: " << error << "" << oendl; 
+        owarn << "OSQLiteDriver::open: " << error << "" << oendl;
         free( error );
         return false;
     }
@@ -183,7 +183,7 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) {
 
 
 OSQLTable::ValueList OSQLiteDriver::tables() const {
-
+    return OSQLTable::ValueList();
 }
 
 
--
cgit v0.9.0.2