commit 1630519
default
·
2023-02-23 17:43:52 +0000 UTC
parent 285dbe1
Deleted index_del_md5() and index_del().
M
data.c
+1,
-53
1@@ -327,57 +327,6 @@ int index_gc(const char *fn)
2 }
3
4
5-int index_del_md5(const char *fn, const char *md5)
6-/* deletes an md5 from an index */
7-{
8- int status = 404;
9- FILE *i, *o;
10-
11- pthread_mutex_lock(&data_mutex);
12-
13- if ((i = fopen(fn, "r")) != NULL) {
14- flock(fileno(i), LOCK_EX);
15-
16- xs *nfn = xs_fmt("%s.new", fn);
17- char line[256];
18-
19- if ((o = fopen(nfn, "w")) != NULL) {
20- while (fgets(line, sizeof(line), i) != NULL) {
21- line[32] = '\0';
22- if (memcmp(line, md5, 32) != 0)
23- fprintf(o, "%s\n", line);
24- }
25-
26- fclose(o);
27-
28- xs *ofn = xs_fmt("%s.bak", fn);
29-
30- unlink(ofn);
31- link(fn, ofn);
32- rename(nfn, fn);
33- }
34- else
35- status = 500;
36-
37- fclose(i);
38- }
39- else
40- status = 500;
41-
42- pthread_mutex_unlock(&data_mutex);
43-
44- return status;
45-}
46-
47-
48-int index_del(const char *fn, const char *id)
49-/* deletes an id from an index */
50-{
51- xs *md5 = xs_md5_hex(id, strlen(id));
52- return index_del_md5(fn, md5);
53-}
54-
55-
56 int index_in_md5(const char *fn, const char *md5)
57 /* checks if the md5 is already in the index */
58 {
59@@ -779,8 +728,7 @@ int _object_user_cache(snac *snac, const char *id, const char *cachedir, int del
60 int ret;
61
62 if (del) {
63- if ((ret = unlink(cfn)) != -1)
64- index_del(idx, id);
65+ ret = unlink(cfn);
66 }
67 else {
68 if ((ret = link(ofn, cfn)) != -1)
M
snac.h
+0,
-1
1@@ -61,7 +61,6 @@ double mtime_nl(const char *fn, int *n_link);
2
3 int index_add(const char *fn, const char *md5);
4 int index_gc(const char *fn);
5-int index_del(const char *fn, const char *md5);
6 int index_first(const char *fn, char *buf, int size);
7 int index_len(const char *fn);
8 d_char *index_list(const char *fn, int max);