author | zecke <zecke> | 2004-08-30 13:31:01 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-08-30 13:31:01 (UTC) |
commit | dc30b84bb9c3759bcfee5e6d162395cad9873465 (patch) (side-by-side diff) | |
tree | ca70ec6c942d078367c81d47a04ad7cda52cd9a1 /libopie2/opiedb/osqlitedriver.cpp | |
parent | ba35591e04701ec0a4a9111ab754b98674ee3d29 (diff) | |
download | opie-dc30b84bb9c3759bcfee5e6d162395cad9873465.zip opie-dc30b84bb9c3759bcfee5e6d162395cad9873465.tar.gz opie-dc30b84bb9c3759bcfee5e6d162395cad9873465.tar.bz2 |
Fix warnings, add sanity check, new default argument to fix warning...
Diffstat (limited to 'libopie2/opiedb/osqlitedriver.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie2/opiedb/osqlitedriver.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ -91,33 +91,33 @@ int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){ } reg->regex_raw = (char *)malloc(strlen(zPattern)+1); strncpy(reg->regex_raw, zPattern, strlen(zPattern)+1); res = regcomp(®->regex_c, zPattern, REG_EXTENDED); if ( res != 0 ) { printf("Regcomp failed with code %u on string %s\n",res,zPattern); free(reg->regex_raw); reg->regex_raw=NULL; return 0; } } res = (regexec(®->regex_c, zString, 0, NULL, 0)==0); return res; } 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; } sqlite_set_result_int(context, sqliteRlikeCompare((const char*)argv[0], (const char*)argv[1], (sqregex *)sqlite_user_data(context) )); } /* * try to open a db specified via setUrl * and options */ bool OSQLiteDriver::open() { char *error; odebug << "OSQLiteDriver::open: about to open" << oendl; @@ -170,33 +170,33 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) { char *err; /* SQLITE_OK 0 if return code > 0 == failure */ if ( sqlite_exec(m_sqlite, qu->query().utf8(),&call_back, &query, &err) > 0 ) { owarn << "OSQLiteDriver::query: Error while executing " << err << "" << oendl; free( err ); // FixMe Errors } OSQLResult result(OSQLResult::Success, query.items, query.errors ); return result; } OSQLTable::ValueList OSQLiteDriver::tables() const { - + return OSQLTable::ValueList(); } OSQLError OSQLiteDriver::lastError() { OSQLError error; return error; }; /* handle a callback add the row to the global * OSQLResultItem */ int OSQLiteDriver::handleCallBack( int, char**, char** ) { return 0; } |