Add strtok in ortp for mingw compilation

[linphone] / coreapi / message_storage.c

diff --git a/coreapi/message_storage.c b/coreapi/message_storage.c
index 0c41c20d078659712f4a7d954c143f38393ee342..765543f7a321a29b379e939cf2651197b5cb0544 100644 (file)
--- a/coreapi/message_storage.c
+++ b/coreapi/message_storage.c
@@ -66,6 +66,7 @@ static void create_chat_message(char **argv, void *data){
                for(j=0;j<12;j++) { \r
                        if(strcmp(tmp2,months[j])==0) ret.tm_mon=j; \r
                }\r
+               ret.tm_isdst=-1;\r
        }\r
        new_message->time=argv[5]!=NULL ? mktime(&ret) : time(NULL);\r
        new_message->state=atoi(argv[7]);\r
@@ -82,7 +83,7 @@ void linphone_sql_request_message(sqlite3 *db,const char *stmt,LinphoneChatRoom
        int ret;\r
        ret=sqlite3_exec(db,stmt,callback,cr,&errmsg);\r
        if(ret != SQLITE_OK) {\r
-               printf("Error in creation: %s.\n", errmsg);\r
+               ms_error("Error in creation: %s.\n", errmsg);\r
                sqlite3_free(errmsg);\r
        }\r
 }\r
@@ -196,20 +197,20 @@ void linphone_create_table(sqlite3* db){
        ret=sqlite3_exec(db,"CREATE TABLE if not exists history (id INTEGER PRIMARY KEY AUTOINCREMENT, localContact TEXT NOT NULL, remoteContact TEXT NOT NULL, direction INTEGER, message TEXT, time TEXT NOT NULL, read INTEGER, status INTEGER);",\r
                0,0,&errmsg);\r
        if(ret != SQLITE_OK) {\r
-               printf("Error in creation: %s.\n", errmsg);\r
+               ms_error("Error in creation: %s.\n", errmsg);\r
                sqlite3_free(errmsg);\r
        }\r
 }\r
 \r
 void linphone_core_message_storage_init(LinphoneCore *lc){\r
        int ret;\r
-       char *errmsg=NULL;\r
+       const char *errmsg;\r
        sqlite3 *db;\r
        ret=sqlite3_open(lc->chat_db_file,&db);\r
        if(ret != SQLITE_OK) {\r
-               printf("Error in the opening: %s.\n", errmsg);\r
+               errmsg=sqlite3_errmsg(db);\r
+               ms_error("Error in the opening: %s.\n", errmsg);\r
                sqlite3_close(db);\r
-               sqlite3_free(errmsg);\r
        }\r
        linphone_create_table(db);\r
        lc->db=db;\r