Merge branch 'master' into bloom

[adu.git] / create.c

diff --git a/create.c b/create.c
index cd000c2bb2225f0e8be72962ac96454942618765..c4d7195878b64c80eef176835743a631110eff9c 100644 (file)
--- a/create.c
+++ b/create.c
@@ -169,7 +169,7 @@ static int scan_dir(char *dirname, uint64_t *parent_dir_num)
                                continue;
                        dir_size += s.st_size;
                        dir_files++;
-                       ret = create_user_table(s.st_uid, &ui);
+                       ret = create_user_table(conf.database_dir_arg, s.st_uid, &ui);
                        if (ret < 0)
                                goto out;
                        ret = update_user_row(ui->table, this_dir_num,
@@ -190,7 +190,7 @@ static int scan_dir(char *dirname, uint64_t *parent_dir_num)
                else
                        dir_size += s.st_size;
                dir_files++;
-               ret = create_user_table(s.st_uid, &ui);
+               ret = create_user_table(conf.database_dir_arg, s.st_uid, &ui);
                if (ret < 0)
                        goto out;
                ret = insert_user_bloom(&s, bloom_buf);
@@ -269,7 +269,7 @@ int com_create(void)
        ret = scan_dir(conf.base_dir_arg, &zero);
        if (ret < 0)
                goto out;
-       ret = write_uid_file();
+       ret = write_uid_file(conf.database_dir_arg);
        log_bloom_stats();
 out:
        bloom_free(global_bloom_filter);