2 files changed, 5 insertions, 6 deletions

diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp
index f07d520..3ba161e 100644
--- a/libopie2/opiedb/osqlitedriver.cpp
+++ b/libopie2/opiedb/osqlitedriver.cpp
@@ -91,113 +91,112 @@ int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){
 
 	if (reg->regex_raw == NULL || (strcmp (zPattern, reg->regex_raw) != 0)){
 		if (reg->regex_raw != NULL) {
 		    free(reg->regex_raw);
 		    regfree(&reg->regex_c);
 		}
 		reg->regex_raw = (char *)malloc(strlen(zPattern)+1);
 		strncpy(reg->regex_raw, zPattern, strlen(zPattern)+1);
 		res = regcomp(&reg->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(&reg->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 || argv[2]==0){
 		printf("One of arguments Null!!\n");
 		return;
 	}
 		sqlite_set_result_int(context,
 		sqliteRlikeCompare((const char*)argv[0],
 	(const char*)argv[1], (sqregex*)argv[2]));
 }
 
 /*
  * try to open a db specified via setUrl
  * and options
  */
 bool OSQLiteDriver::open() {
     char *error;
     qDebug("OSQLiteDriver::open: about to open");
     m_sqlite = sqlite_open(m_url.local8Bit(),
                            0,
                            &error );
 
     /* failed to open */
     if (m_sqlite == 0l ) {
         // FIXME set the last error
         qWarning("OSQLiteDriver::open: %s", error );
         free( error );
         return false;
     }
-    sqreg = (sqregex *)malloc(sizeof(sqreg));
     sqlite_create_function(m_sqlite,"rlike",3,rlikeFunc,&sqreg);
     return true;
 }
 
 
 /* close the db
  * sqlite closes them without
  * telling failure or success
  */
 bool OSQLiteDriver::close() {
     if (m_sqlite )
         sqlite_close( m_sqlite ), m_sqlite=0l;
-	if (sqreg->regex_raw != NULL){
-    	    free(sqreg->regex_raw);
-	    sqreg->regex_raw=NULL;
-	    regfree(&sqreg->regex_c);
+	if (sqreg.regex_raw != NULL){
+    	    free(sqreg.regex_raw);
+	    sqreg.regex_raw=NULL;
+	    regfree(&sqreg.regex_c);
 	}
     return true;
 }
 
 
 /* Query */
 OSQLResult OSQLiteDriver::query( OSQLQuery* qu) {
     if ( !m_sqlite ) {
         // FIXME set error code
         OSQLResult result( OSQLResult::Failure );
         return result;
     }
     Query query;
     query.driver = this;
     char *err;
     /* SQLITE_OK 0 if return code > 0 == failure */
     if ( sqlite_exec(m_sqlite, qu->query(),&call_back, &query, &err)  > 0 ) {
         qWarning("OSQLiteDriver::query: Error while executing");
         free(err );
         // FixMe Errors
     }
 
     OSQLResult result(OSQLResult::Success,
                       query.items,
                       query.errors );
     return result;
 }
 
 
 OSQLTable::ValueList OSQLiteDriver::tables() const {
 
 }
 
 
 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;
 }
 
 
diff --git a/libopie2/opiedb/osqlitedriver.h b/libopie2/opiedb/osqlitedriver.h
index 95c9e2f..adec331 100644
--- a/libopie2/opiedb/osqlitedriver.h
+++ b/libopie2/opiedb/osqlitedriver.h
@@ -1,50 +1,50 @@
 #ifndef OSQL_LITE_DRIVER_H
 #define OSQL_LITE_DRIVER_H
 
 #include <sqlite.h>
 #include <regex.h>
 
 #include "osqldriver.h"
 #include "osqlerror.h"
 #include "osqlresult.h"
 
 namespace Opie {
 namespace DB {
 namespace Internal {
 
 struct sqregex {
 	char *regex_raw;
 	regex_t regex_c;
 };
 
 class OSQLiteDriver : public OSQLDriver {
     Q_OBJECT
 public:
     OSQLiteDriver( QLibrary *lib = 0l );
     ~OSQLiteDriver();
     QString id()const;
     void setUserName( const QString& );
     void setPassword( const QString& );
     void setUrl( const QString& url );
     void setOptions( const QStringList& );
     bool open();
     bool close();
     OSQLError lastError();
     OSQLResult query( OSQLQuery* );
     OSQLTable::ValueList tables()const;
 
 private:
     OSQLError m_lastE;
     OSQLResult m_result;
     OSQLResultItem m_items;
     int handleCallBack( int, char**, char** );
     static int call_back( void*, int, char**, char** );
     QString m_url;
     sqlite *m_sqlite;
-    sqregex *sqreg;
+    sqregex sqreg;
 };
 }
 }
 }
 
 #endif