1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
diff -rNc cyrus-imapd-2.5.15.orig/lib/cyrusdb_berkeley.c cyrus-imapd-2.5.15/lib/cyrusdb_berkeley.c
*** cyrus-imapd-2.5.15.orig/lib/cyrusdb_berkeley.c 2019-12-16 05:34:28.000000000 +0100
--- cyrus-imapd-2.5.15/lib/cyrusdb_berkeley.c 2020-01-01 20:42:15.495203815 +0100
***************
*** 456,462 ****
return r;
}
! static int gettid(struct txn **mytid, DB_TXN **tid, const char *where)
{
int r;
--- 456,462 ----
return r;
}
! static int mygettid(struct txn **mytid, DB_TXN **tid, const char *where)
{
int r;
***************
*** 499,505 ****
if (data) *data = NULL;
if (datalen) *datalen = 0;
! r = gettid(mytid, &tid, "myfetch");
if (r) return r;
memset(&k, 0, sizeof(k));
--- 499,505 ----
if (data) *data = NULL;
if (datalen) *datalen = 0;
! r = mygettid(mytid, &tid, "myfetch");
if (r) return r;
memset(&k, 0, sizeof(k));
***************
*** 594,600 ****
/* k.flags |= DB_DBT_REALLOC;
d.flags |= DB_DBT_REALLOC;*/
! r = gettid(mytid, &tid, "foreach");
if (r) return r;
if (0) {
--- 594,600 ----
/* k.flags |= DB_DBT_REALLOC;
d.flags |= DB_DBT_REALLOC;*/
! r = mygettid(mytid, &tid, "foreach");
if (r) return r;
if (0) {
***************
*** 739,745 ****
if (!data)
datalen = 0;
! r = gettid(mytid, &tid, "mystore");
if (r) return r;
memset(&k, 0, sizeof(k));
--- 739,745 ----
if (!data)
datalen = 0;
! r = mygettid(mytid, &tid, "mystore");
if (r) return r;
memset(&k, 0, sizeof(k));
***************
*** 852,858 ****
assert(dbinit && db);
assert(key && keylen);
! r = gettid(mytid, &tid, "delete");
if (r) return r;
memset(&k, 0, sizeof(k));
--- 852,858 ----
assert(dbinit && db);
assert(key && keylen);
! r = mygettid(mytid, &tid, "delete");
if (r) return r;
memset(&k, 0, sizeof(k));
|