mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-28 00:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

First use of sqlite3 bctbx custom vfs.

Browse source
This commit is contained in:
Sandrine Avakian 2016-05-12 10:36:58 +02:00
parent 3ecf8e0e20
commit c400e2f563
3 changed files with 37 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
coreapi/call_log.c
View file

@ -373,7 +373,9 @@ void linphone_core_call_log_storage_init(LinphoneCore *lc) {
int ret;
const char *errmsg;
sqlite3 *db;
sqlite3_vfs_register(sqlite3_bctbx_vfs_create(), 1);
sqlite3_vfs* t = sqlite3_vfs_find("sql3_bctbx_vfs");
sqlite3_vfs_register(t, 1);
linphone_core_call_log_storage_close(lc);
ret=_linphone_sqlite3_open(lc->logs_db_file, &db);

30
coreapi/lpconfig.c
View file

@ -81,13 +81,13 @@ typedef struct _LpSection{
struct _LpConfig{
int refcnt;
bc_vfs_file* pFile;
bctbx_vfs_file* pFile;
char *filename;
char *tmpfilename;
MSList *sections;
int modified;
int readonly;
bc_vfs* g_bc_vfs;
bctbx_vfs* g_bctbx_vfs;
};
@ -360,7 +360,7 @@ static LpSection* lp_config_parse_line(LpConfig* lpconfig, const char* line, LpS
return cur;
}
void lp_config_parse(LpConfig *lpconfig, bc_vfs_file* pFile){
void lp_config_parse(LpConfig *lpconfig, bctbx_vfs_file* pFile){
char tmp[MAX_LEN]= {'\0'};
LpSection* current_section = NULL;
int size =0;
@ -398,8 +398,8 @@ LpConfig * lp_config_new_from_buffer(const char *buffer){
LpConfig *lp_config_new_with_factory(const char *config_filename, const char *factory_config_filename) {
LpConfig *lpconfig=lp_new0(LpConfig,1);
bc_vfs_register(bc_create_vfs(),&lpconfig->g_bc_vfs);
bc_vfs_file* pFile = NULL;
bctbx_vfs_register(bc_create_vfs(),&lpconfig->g_bctbx_vfs);
bctbx_vfs_file* pFile = NULL;
lpconfig->refcnt=1;
if (config_filename!=NULL){
if(ortp_file_exist(config_filename) == 0) {
@ -428,13 +428,13 @@ LpConfig *lp_config_new_with_factory(const char *config_filename, const char *fa
#endif /*_WIN32*/
/*open with r+ to check if we can write on it later*/
int fd;
pFile = bctbx_file_open(lpconfig->g_bc_vfs,lpconfig->filename, "r+");
pFile = bctbx_file_open(lpconfig->g_bctbx_vfs,lpconfig->filename, "r+");
fd = pFile->fd;
lpconfig->pFile = pFile;
#ifdef RENAME_REQUIRES_NONEXISTENT_NEW_PATH
if (fd < 0){
pFile = bctbx_file_open(lpconfig->g_bc_vfs,lpconfig->tmpfilename, "r+");
pFile = bctbx_file_open(lpconfig->g_bctbx_vfs,lpconfig->tmpfilename, "r+");
if (fd){
ms_warning("Could not open %s but %s works, app may have crashed during last sync.",lpconfig->filename,lpconfig->tmpfilename);
}
@ -460,7 +460,7 @@ fail:
int lp_config_read_file(LpConfig *lpconfig, const char *filename){
char* path = lp_realpath(filename, NULL);
int fd=-1;
bc_vfs_file* pFile = bctbx_file_open(lpconfig->g_bc_vfs, path, "r");
bctbx_vfs_file* pFile = bctbx_file_open(lpconfig->g_bctbx_vfs, path, "r");
fd = pFile->fd;
if (fd < 0){
ms_message("Reading config information from %s", path);
@ -756,7 +756,7 @@ int lp_config_sync(LpConfig *lpconfig){
/* don't create group/world-accessible files */
(void) umask(S_IRWXG | S_IRWXO);
#endif
bc_vfs_file *pFile = bctbx_file_open(lpconfig->g_bc_vfs,lpconfig->tmpfilename, "w");
bctbx_vfs_file *pFile = bctbx_file_open(lpconfig->g_bctbx_vfs,lpconfig->tmpfilename, "w");
lpconfig->pFile = pFile;
fd = pFile->fd;
if (fd < 0 ){
@ -883,7 +883,7 @@ static const char *_lp_config_dirname(char *path) {
}
bool_t lp_config_relative_file_exists(const LpConfig *lpconfig, const char *filename) {
bc_vfs_file *pFile = lpconfig->pFile;
bctbx_vfs_file *pFile = lpconfig->pFile;
if (lpconfig->filename == NULL) {
return FALSE;
} else {
@ -897,7 +897,7 @@ bool_t lp_config_relative_file_exists(const LpConfig *lpconfig, const char *file
if(realfilepath == NULL) return FALSE;
pFile = bctbx_file_open(lpconfig->g_bc_vfs,realfilepath, "r");
pFile = bctbx_file_open(lpconfig->g_bctbx_vfs,realfilepath, "r");
ms_free(realfilepath);
if (pFile->fd > 0) {
bctbx_file_close(pFile);
@ -913,7 +913,7 @@ void lp_config_write_relative_file(const LpConfig *lpconfig, const char *filenam
char *realfilepath = NULL;
int fd = 0;
bc_vfs_file *pFile = lpconfig->pFile;
bctbx_vfs_file *pFile = lpconfig->pFile;
if (lpconfig->filename == NULL) return;
if(strlen(data) == 0) {
@ -930,7 +930,7 @@ void lp_config_write_relative_file(const LpConfig *lpconfig, const char *filenam
goto end;
}
pFile = bctbx_file_open(lpconfig->g_bc_vfs,realfilepath, "w");
pFile = bctbx_file_open(lpconfig->g_bctbx_vfs,realfilepath, "w");
fd = pFile->fd;
if(fd < 0) {
@ -952,7 +952,7 @@ int lp_config_read_relative_file(const LpConfig *lpconfig, const char *filename,
const char *dir = NULL;
char *filepath = NULL;
int fd = 0;
bc_vfs_file* pFile = NULL;
bctbx_vfs_file* pFile = NULL;
char* realfilepath = NULL;
@ -967,7 +967,7 @@ int lp_config_read_relative_file(const LpConfig *lpconfig, const char *filename,
goto err;
}
pFile = bctbx_file_open(lpconfig->g_bc_vfs,realfilepath,"r");
pFile = bctbx_file_open(lpconfig->g_bctbx_vfs,realfilepath,"r");
if (pFile !=NULL)
fd = pFile->fd;

21
coreapi/message_storage.c
View file

@ -662,8 +662,25 @@ void linphone_core_message_storage_set_debug(LinphoneCore *lc, bool_t debug){
void linphone_core_message_storage_init(LinphoneCore *lc){
int ret;
const char *errmsg;
sqlite3 *db;
sqlite3 *db = NULL;
sqlite3_vfs_register(sqlite3_bctbx_vfs_create(), 1);
sqlite3_vfs* t = sqlite3_vfs_find("sql3_bctbx_vfs");
sqlite3_vfs* pDefault = sqlite3_vfs_find("unix-none");
t->xAccess = pDefault->xAccess;
t->xCurrentTime = pDefault->xCurrentTime;
t->xCurrentTimeInt64 = pDefault->xCurrentTimeInt64;
t->xFullPathname = pDefault->xFullPathname;
t->xDelete = pDefault->xDelete;
t->xSleep = pDefault->xSleep;
t->xRandomness = pDefault->xRandomness;
t->xGetLastError = pDefault->xGetLastError;
t->xGetSystemCall = pDefault->xGetSystemCall;
t->xSetSystemCall = pDefault->xSetSystemCall;
t->xNextSystemCall = pDefault->xNextSystemCall;
//t->xOpen = pDefault->xOpen;
//t->pAppData = pDefault->pAppData;
sqlite3_vfs_unregister(t);
sqlite3_vfs_register(t, 1);
linphone_core_message_storage_close(lc);
ret=_linphone_sqlite3_open(lc->chat_db_file,&db);