Skip to content

Commit d0def5d

Browse files
committed
Renamed file_delete to file_delete_internal in unittest
1 parent 673a63b commit d0def5d

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

test/unit.c

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ int close_db_v2 (sqlite3 *db) {
269269
return counter;
270270
}
271271

272-
static bool file_delete (const char *path) {
272+
bool file_delete_internal (const char *path) {
273273
#ifdef _WIN32
274274
if (DeleteFile(path) == 0) return false;
275275
#else
@@ -2399,7 +2399,7 @@ bool do_test_merge (int nclients, bool print_result, bool cleanup_databases) {
23992399
if (cleanup_databases) {
24002400
char buf[256];
24012401
do_build_database_path(buf, i, timestamp, saved_counter++);
2402-
file_delete(buf);
2402+
file_delete_internal(buf);
24032403
}
24042404
}
24052405
return result;
@@ -2530,7 +2530,7 @@ bool do_test_merge_2 (int nclients, int table_mask, bool print_result, bool clea
25302530
if (cleanup_databases) {
25312531
char buf[256];
25322532
do_build_database_path(buf, i, timestamp, saved_counter++);
2533-
file_delete(buf);
2533+
file_delete_internal(buf);
25342534
}
25352535
}
25362536
return result;
@@ -2610,7 +2610,7 @@ bool do_test_merge_4 (int nclients, bool print_result, bool cleanup_databases) {
26102610
if (cleanup_databases) {
26112611
char buf[256];
26122612
do_build_database_path(buf, i, timestamp, saved_counter++);
2613-
file_delete(buf);
2613+
file_delete_internal(buf);
26142614
}
26152615
}
26162616
return result;
@@ -2712,7 +2712,7 @@ bool do_test_merge_5 (int nclients, bool print_result, bool cleanup_databases, b
27122712
if (cleanup_databases) {
27132713
char buf[256];
27142714
do_build_database_path(buf, i, timestamp, saved_counter++);
2715-
file_delete(buf);
2715+
file_delete_internal(buf);
27162716
}
27172717
}
27182718
return result;
@@ -2804,7 +2804,7 @@ bool do_test_merge_alter_schema_1 (int nclients, bool print_result, bool cleanup
28042804
if (cleanup_databases) {
28052805
char buf[256];
28062806
do_build_database_path(buf, i, timestamp, saved_counter++);
2807-
file_delete(buf);
2807+
file_delete_internal(buf);
28082808
}
28092809
}
28102810
return result;
@@ -2899,7 +2899,7 @@ bool do_test_merge_alter_schema_2 (int nclients, bool print_result, bool cleanup
28992899
if (cleanup_databases) {
29002900
char buf[256];
29012901
do_build_database_path(buf, i, timestamp, saved_counter++);
2902-
file_delete(buf);
2902+
file_delete_internal(buf);
29032903
}
29042904
}
29052905
return result;
@@ -3020,7 +3020,7 @@ bool do_test_merge_two_tables (int nclients, bool print_result, bool cleanup_dat
30203020
if (cleanup_databases) {
30213021
char buf[256];
30223022
do_build_database_path(buf, i, timestamp, saved_counter++);
3023-
file_delete(buf);
3023+
file_delete_internal(buf);
30243024
}
30253025
}
30263026
return result;
@@ -3119,7 +3119,7 @@ bool do_test_merge_conflicting_pkeys (int nclients, bool print_result, bool clea
31193119
if (cleanup_databases) {
31203120
char buf[256];
31213121
do_build_database_path(buf, i, timestamp, saved_counter++);
3122-
file_delete(buf);
3122+
file_delete_internal(buf);
31233123
}
31243124
}
31253125
return result;
@@ -3213,7 +3213,7 @@ bool do_test_merge_large_dataset (int nclients, bool print_result, bool cleanup_
32133213
if (cleanup_databases) {
32143214
char buf[256];
32153215
do_build_database_path(buf, i, timestamp, saved_counter++);
3216-
file_delete(buf);
3216+
file_delete_internal(buf);
32173217
}
32183218
}
32193219
return result;
@@ -3332,7 +3332,7 @@ bool do_test_merge_nested_transactions (int nclients, bool print_result, bool cl
33323332
if (cleanup_databases) {
33333333
char buf[256];
33343334
do_build_database_path(buf, i, timestamp, saved_counter++);
3335-
file_delete(buf);
3335+
file_delete_internal(buf);
33363336
}
33373337
}
33383338
return result;
@@ -3424,7 +3424,7 @@ bool do_test_merge_three_way (int nclients, bool print_result, bool cleanup_data
34243424
if (cleanup_databases) {
34253425
char buf[256];
34263426
do_build_database_path(buf, i, timestamp, saved_counter++);
3427-
file_delete(buf);
3427+
file_delete_internal(buf);
34283428
}
34293429
}
34303430
return result;
@@ -3518,7 +3518,7 @@ bool do_test_merge_null_values (int nclients, bool print_result, bool cleanup_da
35183518
if (cleanup_databases) {
35193519
char buf[256];
35203520
do_build_database_path(buf, i, timestamp, saved_counter++);
3521-
file_delete(buf);
3521+
file_delete_internal(buf);
35223522
}
35233523
}
35243524
return result;
@@ -3606,7 +3606,7 @@ bool do_test_merge_blob_data (int nclients, bool print_result, bool cleanup_data
36063606
if (cleanup_databases) {
36073607
char buf[256];
36083608
do_build_database_path(buf, i, timestamp, saved_counter++);
3609-
file_delete(buf);
3609+
file_delete_internal(buf);
36103610
}
36113611
}
36123612
return result;
@@ -3734,7 +3734,7 @@ bool do_test_merge_mixed_operations (int nclients, bool print_result, bool clean
37343734
if (cleanup_databases) {
37353735
char buf[256];
37363736
do_build_database_path(buf, i, timestamp, saved_counter++);
3737-
file_delete(buf);
3737+
file_delete_internal(buf);
37383738
}
37393739
}
37403740
return result;
@@ -3829,7 +3829,7 @@ bool do_test_merge_hub_spoke (int nclients, bool print_result, bool cleanup_data
38293829
if (cleanup_databases) {
38303830
char buf[256];
38313831
do_build_database_path(buf, i, timestamp, saved_counter++);
3832-
file_delete(buf);
3832+
file_delete_internal(buf);
38333833
}
38343834
}
38353835
return result;
@@ -3921,7 +3921,7 @@ bool do_test_merge_timestamp_precision (int nclients, bool print_result, bool cl
39213921
if (cleanup_databases) {
39223922
char buf[256];
39233923
do_build_database_path(buf, i, timestamp, saved_counter++);
3924-
file_delete(buf);
3924+
file_delete_internal(buf);
39253925
}
39263926
}
39273927
return result;
@@ -4012,7 +4012,7 @@ bool do_test_merge_partial_failure (int nclients, bool print_result, bool cleanu
40124012
if (cleanup_databases) {
40134013
char buf[256];
40144014
do_build_database_path(buf, i, timestamp, saved_counter++);
4015-
file_delete(buf);
4015+
file_delete_internal(buf);
40164016
}
40174017
}
40184018
return result;
@@ -4121,7 +4121,7 @@ bool do_test_merge_rollback_scenarios (int nclients, bool print_result, bool cle
41214121
if (cleanup_databases) {
41224122
char buf[256];
41234123
do_build_database_path(buf, i, timestamp, saved_counter++);
4124-
file_delete(buf);
4124+
file_delete_internal(buf);
41254125
}
41264126
}
41274127
return result;
@@ -4216,7 +4216,7 @@ bool do_test_merge_circular (int nclients, bool print_result, bool cleanup_datab
42164216
if (cleanup_databases) {
42174217
char buf[256];
42184218
do_build_database_path(buf, i, timestamp, saved_counter++);
4219-
file_delete(buf);
4219+
file_delete_internal(buf);
42204220
}
42214221
}
42224222
return result;
@@ -4343,7 +4343,7 @@ bool do_test_merge_foreign_keys (int nclients, bool print_result, bool cleanup_d
43434343
if (cleanup_databases) {
43444344
char buf[256];
43454345
do_build_database_path(buf, i, timestamp, saved_counter++);
4346-
file_delete(buf);
4346+
file_delete_internal(buf);
43474347
}
43484348
}
43494349
return result;
@@ -4453,7 +4453,7 @@ bool do_test_merge_triggers (int nclients, bool print_result, bool cleanup_datab
44534453
if (cleanup_databases) {
44544454
char buf[256];
44554455
do_build_database_path(buf, i, timestamp, saved_counter++);
4456-
file_delete(buf);
4456+
file_delete_internal(buf);
44574457
}
44584458
}
44594459
return result;
@@ -4589,7 +4589,7 @@ bool do_test_merge_index_consistency (int nclients, bool print_result, bool clea
45894589
if (cleanup_databases) {
45904590
char buf[256];
45914591
do_build_database_path(buf, i, timestamp, saved_counter++);
4592-
file_delete(buf);
4592+
file_delete_internal(buf);
45934593
}
45944594
}
45954595
return result;
@@ -4699,7 +4699,7 @@ bool do_test_merge_json_columns (int nclients, bool print_result, bool cleanup_d
46994699
if (cleanup_databases) {
47004700
char buf[256];
47014701
do_build_database_path(buf, i, timestamp, saved_counter++);
4702-
file_delete(buf);
4702+
file_delete_internal(buf);
47034703
}
47044704
}
47054705
return result;
@@ -4818,7 +4818,7 @@ bool do_test_merge_concurrent_attempts (int nclients, bool print_result, bool cl
48184818
if (cleanup_databases) {
48194819
char buf[256];
48204820
do_build_database_path(buf, i, timestamp, saved_counter++);
4821-
file_delete(buf);
4821+
file_delete_internal(buf);
48224822
}
48234823
}
48244824
return result;
@@ -4900,7 +4900,7 @@ bool do_test_prikey (int nclients, bool print_result, bool cleanup_databases) {
49004900
if (cleanup_databases) {
49014901
char buf[256];
49024902
do_build_database_path(buf, i, timestamp, saved_counter++);
4903-
file_delete(buf);
4903+
file_delete_internal(buf);
49044904
}
49054905
}
49064906
return result;
@@ -4946,7 +4946,7 @@ bool do_test_double_init(int nclients, bool cleanup_databases) {
49464946
if (cleanup_databases) {
49474947
char buf[256];
49484948
do_build_database_path(buf, i, timestamp, test_counter);
4949-
file_delete(buf);
4949+
file_delete_internal(buf);
49504950
}
49514951
}
49524952
test_counter++;
@@ -5034,7 +5034,7 @@ bool do_test_gos (int nclients, bool print_result, bool cleanup_databases) {
50345034
if (cleanup_databases) {
50355035
char buf[256];
50365036
do_build_database_path(buf, i, timestamp, saved_counter++);
5037-
file_delete(buf);
5037+
file_delete_internal(buf);
50385038
}
50395039
}
50405040
return result;
@@ -5131,7 +5131,7 @@ bool do_test_network_encode_decode (int nclients, bool print_result, bool cleanu
51315131
if (cleanup_databases) {
51325132
char buf[256];
51335133
do_build_database_path(buf, i, timestamp, saved_counter++);
5134-
file_delete(buf);
5134+
file_delete_internal(buf);
51355135
}
51365136
}
51375137
return result;
@@ -5237,7 +5237,7 @@ bool do_test_fill_initial_data(int nclients, bool print_result, bool cleanup_dat
52375237
if (cleanup_databases) {
52385238
char buf[256];
52395239
do_build_database_path(buf, i, timestamp, saved_counter++);
5240-
file_delete(buf);
5240+
file_delete_internal(buf);
52415241
}
52425242
}
52435243
return result;
@@ -5354,7 +5354,7 @@ bool do_test_alter(int nclients, int alter_version, bool print_result, bool clea
53545354
if (cleanup_databases) {
53555355
char buf[256];
53565356
do_build_database_path(buf, i, timestamp, saved_counter++);
5357-
file_delete(buf);
5357+
file_delete_internal(buf);
53585358
}
53595359
}
53605360
return result;

0 commit comments

Comments
 (0)