X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=create.c;h=c4d7195878b64c80eef176835743a631110eff9c;hb=25e4fb919ce9b87aeb5aa3456b687c5c3ba55a9e;hp=e3f09d4b61726fdac46edef85c458b157ef6431a;hpb=4074e7034641cbbbfc861961d216d58a503d0aee;p=adu.git

diff --git a/create.c b/create.c
index e3f09d4..c4d7195 100644
--- a/create.c
+++ b/create.c
@@ -56,8 +56,7 @@ static int insert_global_bloom(struct stat64 *s,
 {
 	if (!consider_bloom(s))
 		return 0;
-	return bloom_test_and_insert(buf, GLOBAL_BLOOM_BUF_SIZE,
-		global_bloom_filter);
+	return bloom_insert(buf, GLOBAL_BLOOM_BUF_SIZE, global_bloom_filter);
 }
 
 static int insert_user_bloom(struct stat64 *s,
@@ -65,8 +64,7 @@ static int insert_user_bloom(struct stat64 *s,
 {
 	if (!consider_bloom(s))
 		return 0;
-	return bloom_test_and_insert(buf, USER_BLOOM_BUF_SIZE,
-		user_bloom_filter);
+	return bloom_insert(buf, USER_BLOOM_BUF_SIZE, user_bloom_filter);
 }
 
 static int add_directory(char *dirname, uint64_t *dir_num, uint64_t *parent_dir_num,
@@ -171,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,
@@ -192,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);
@@ -271,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);