mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 07:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

DB_ENV->set_data_dir cleaned up and tightened

Browse source 
Fixes a bug where I forgot to set the reallocced memory.
Addresses #42

git-svn-id: file:///svn/tokudb@1305 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Yoni Fogel 2007-12-21 06:18:16 +00:00
parent 131ce32d51
commit 4c90d3a8d0
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/ydb.c
View file

@ -375,7 +375,8 @@ static int toku_db_env_set_cachesize(DB_ENV * env, u_int32_t gbytes, u_int32_t b
static int toku_db_env_set_data_dir(DB_ENV * env, const char *dir) {
u_int32_t i;
int r;
void* temp;
char** temp;
char* new_dir;
if (db_env_opened(env) || !dir)
return EINVAL;
@ -390,19 +391,17 @@ static int toku_db_env_set_data_dir(DB_ENV * env, const char *dir) {
}
}
else assert(env->i->n_data_dirs == 0);
temp = (char**) toku_realloc(env->i->data_dirs, (1 + env->i->n_data_dirs) * sizeof(char*));
if (temp==NULL) {assert(errno == ENOMEM); return ENOMEM;}
env->i->data_dirs[env->i->n_data_dirs] = toku_strdup(dir);
if (env->i->data_dirs[env->i->n_data_dirs]==NULL) {
assert(errno==ENOMEM);
r = ENOMEM;
if (env->i->n_data_dirs > 0) {
toku_free(env->i->data_dirs);
env->i->data_dirs = NULL;
}
else env->i->data_dirs = toku_realloc(env->i->data_dirs, env->i->n_data_dirs * sizeof(char*));
new_dir = toku_strdup(dir);
if (0) {
died1:
toku_free(new_dir);
return r;
}
if (new_dir==NULL) {assert(errno == ENOMEM); return ENOMEM;}
temp = (char**) toku_realloc(env->i->data_dirs, (1 + env->i->n_data_dirs) * sizeof(char*));
if (temp==NULL) {assert(errno == ENOMEM); r = ENOMEM; goto died1;}
else env->i->data_dirs = temp;
env->i->data_dirs[env->i->n_data_dirs] = new_dir;
env->i->n_data_dirs++;
return 0;
}