]>
Commit | Line | Data |
---|---|---|
52f71c64 MB |
1 | --- db-4.7.25/crypto/aes_method.c.formatsec 2013-02-14 09:48:20.463631633 +0000 |
2 | +++ db-4.7.25/crypto/aes_method.c 2013-02-14 09:47:23.207275151 +0000 | |
3 | @@ -267,6 +267,6 @@ __aes_err(env, err) | |
4 | errstr = "AES error unrecognized"; | |
5 | break; | |
6 | } | |
7 | - __db_errx(env, errstr); | |
8 | + __db_errx(env, "%s", errstr); | |
9 | return; | |
10 | } | |
11 | --- db-4.7.25/repmgr/repmgr_net.c.formatsec 2013-02-14 09:39:50.000000000 +0000 | |
12 | +++ db-4.7.25/repmgr/repmgr_net.c 2013-02-14 09:40:05.000000000 +0000 | |
13 | @@ -1136,7 +1136,7 @@ __repmgr_listen(env) | |
14 | } | |
15 | ||
16 | ret = net_errno; | |
17 | - __db_err(env, ret, why); | |
18 | + __db_err(env, ret, "%s", why); | |
19 | clean: if (s != INVALID_SOCKET) | |
20 | (void)closesocket(s); | |
21 | return (ret); | |
22 | --- db-4.7.25/rpc_client/client.c.formatsec 2013-02-14 09:51:31.385930652 +0000 | |
23 | +++ db-4.7.25/rpc_client/client.c 2013-02-14 09:51:57.902453666 +0000 | |
24 | @@ -66,7 +66,7 @@ __dbcl_env_set_rpc_server(dbenv, clnt, h | |
25 | if (clnt == NULL) { | |
26 | if ((cl = clnt_create((char *)host, DB_RPC_SERVERPROG, | |
27 | DB_RPC_SERVERVERS, "tcp")) == NULL) { | |
28 | - __db_errx(env, clnt_spcreateerror((char *)host)); | |
29 | + __db_errx(env, "%s", clnt_spcreateerror((char *)host)); | |
30 | return (DB_NOSERVER); | |
31 | } | |
32 | if (tsec != 0) { | |
33 | --- db-4.7.25/rpc_client/gen_client.c.formatsec 2013-02-14 09:56:14.657729370 +0000 | |
34 | +++ db-4.7.25/rpc_client/gen_client.c 2013-02-14 10:07:50.099400135 +0000 | |
35 | @@ -82,7 +82,7 @@ __dbcl_env_create(dbenv, timeout) | |
36 | ||
37 | replyp = __db_env_create_4007(&msg, cl); | |
38 | if (replyp == NULL) { | |
39 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
40 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
41 | ret = DB_NOSERVER; | |
42 | goto out; | |
43 | } | |
44 | @@ -116,7 +116,7 @@ __dbcl_env_cdsgroup_begin(dbenv, txnpp) | |
45 | ||
46 | replyp = __db_env_cdsgroup_begin_4007(&msg, cl); | |
47 | if (replyp == NULL) { | |
48 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
49 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
50 | ret = DB_NOSERVER; | |
51 | goto out; | |
52 | } | |
53 | @@ -151,7 +151,7 @@ __dbcl_env_close(dbenv, flags) | |
54 | ||
55 | replyp = __db_env_close_4007(&msg, cl); | |
56 | if (replyp == NULL) { | |
57 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
58 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
59 | ret = DB_NOSERVER; | |
60 | goto out; | |
61 | } | |
62 | @@ -202,7 +202,7 @@ __dbcl_env_dbremove(dbenv, txnp, name, s | |
63 | ||
64 | replyp = __db_env_dbremove_4007(&msg, cl); | |
65 | if (replyp == NULL) { | |
66 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
67 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
68 | ret = DB_NOSERVER; | |
69 | goto out; | |
70 | } | |
71 | @@ -258,7 +258,7 @@ __dbcl_env_dbrename(dbenv, txnp, name, s | |
72 | ||
73 | replyp = __db_env_dbrename_4007(&msg, cl); | |
74 | if (replyp == NULL) { | |
75 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
76 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
77 | ret = DB_NOSERVER; | |
78 | goto out; | |
79 | } | |
80 | @@ -295,7 +295,7 @@ __dbcl_env_get_cachesize(dbenv, gbytesp, | |
81 | ||
82 | replyp = __db_env_get_cachesize_4007(&msg, cl); | |
83 | if (replyp == NULL) { | |
84 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
85 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
86 | ret = DB_NOSERVER; | |
87 | goto out; | |
88 | } | |
89 | @@ -335,7 +335,7 @@ __dbcl_env_get_encrypt_flags(dbenv, flag | |
90 | ||
91 | replyp = __db_env_get_encrypt_flags_4007(&msg, cl); | |
92 | if (replyp == NULL) { | |
93 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
94 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
95 | ret = DB_NOSERVER; | |
96 | goto out; | |
97 | } | |
98 | @@ -371,7 +371,7 @@ __dbcl_env_get_flags(dbenv, flagsp) | |
99 | ||
100 | replyp = __db_env_get_flags_4007(&msg, cl); | |
101 | if (replyp == NULL) { | |
102 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
103 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
104 | ret = DB_NOSERVER; | |
105 | goto out; | |
106 | } | |
107 | @@ -407,7 +407,7 @@ __dbcl_env_get_home(dbenv, homep) | |
108 | ||
109 | replyp = __db_env_get_home_4007(&msg, cl); | |
110 | if (replyp == NULL) { | |
111 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
112 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
113 | ret = DB_NOSERVER; | |
114 | goto out; | |
115 | } | |
116 | @@ -443,7 +443,7 @@ __dbcl_env_get_open_flags(dbenv, flagsp) | |
117 | ||
118 | replyp = __db_env_get_open_flags_4007(&msg, cl); | |
119 | if (replyp == NULL) { | |
120 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
121 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
122 | ret = DB_NOSERVER; | |
123 | goto out; | |
124 | } | |
125 | @@ -487,7 +487,7 @@ __dbcl_env_open(dbenv, home, flags, mode | |
126 | ||
127 | replyp = __db_env_open_4007(&msg, cl); | |
128 | if (replyp == NULL) { | |
129 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
130 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
131 | ret = DB_NOSERVER; | |
132 | goto out; | |
133 | } | |
134 | @@ -527,7 +527,7 @@ __dbcl_env_remove(dbenv, home, flags) | |
135 | ||
136 | replyp = __db_env_remove_4007(&msg, cl); | |
137 | if (replyp == NULL) { | |
138 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
139 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
140 | ret = DB_NOSERVER; | |
141 | goto out; | |
142 | } | |
143 | @@ -567,7 +567,7 @@ __dbcl_env_set_cachesize(dbenv, gbytes, | |
144 | ||
145 | replyp = __db_env_set_cachesize_4007(&msg, cl); | |
146 | if (replyp == NULL) { | |
147 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
148 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
149 | ret = DB_NOSERVER; | |
150 | goto out; | |
151 | } | |
152 | @@ -607,7 +607,7 @@ __dbcl_env_set_encrypt(dbenv, passwd, fl | |
153 | ||
154 | replyp = __db_env_set_encrypt_4007(&msg, cl); | |
155 | if (replyp == NULL) { | |
156 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
157 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
158 | ret = DB_NOSERVER; | |
159 | goto out; | |
160 | } | |
161 | @@ -644,7 +644,7 @@ __dbcl_env_set_flags(dbenv, flags, onoff | |
162 | ||
163 | replyp = __db_env_set_flags_4007(&msg, cl); | |
164 | if (replyp == NULL) { | |
165 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
166 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
167 | ret = DB_NOSERVER; | |
168 | goto out; | |
169 | } | |
170 | @@ -686,7 +686,7 @@ __dbcl_env_txn_begin(dbenv, parent, txnp | |
171 | ||
172 | replyp = __db_env_txn_begin_4007(&msg, cl); | |
173 | if (replyp == NULL) { | |
174 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
175 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
176 | ret = DB_NOSERVER; | |
177 | goto out; | |
178 | } | |
179 | @@ -726,7 +726,7 @@ __dbcl_env_txn_recover(dbenv, preplist, | |
180 | ||
181 | replyp = __db_env_txn_recover_4007(&msg, cl); | |
182 | if (replyp == NULL) { | |
183 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
184 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
185 | ret = DB_NOSERVER; | |
186 | goto out; | |
187 | } | |
188 | @@ -762,7 +762,7 @@ __dbcl_db_create(dbp, dbenv, flags) | |
189 | ||
190 | replyp = __db_db_create_4007(&msg, cl); | |
191 | if (replyp == NULL) { | |
192 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
193 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
194 | ret = DB_NOSERVER; | |
195 | goto out; | |
196 | } | |
197 | @@ -818,7 +818,7 @@ __dbcl_db_associate(dbp, txnp, sdbp, fun | |
198 | ||
199 | replyp = __db_db_associate_4007(&msg, cl); | |
200 | if (replyp == NULL) { | |
201 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
202 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
203 | ret = DB_NOSERVER; | |
204 | goto out; | |
205 | } | |
206 | @@ -858,7 +858,7 @@ __dbcl_db_close(dbp, flags) | |
207 | ||
208 | replyp = __db_db_close_4007(&msg, cl); | |
209 | if (replyp == NULL) { | |
210 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
211 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
212 | ret = DB_NOSERVER; | |
213 | goto out; | |
214 | } | |
215 | @@ -904,7 +904,7 @@ __dbcl_db_cursor(dbp, txnp, dbcpp, flags | |
216 | ||
217 | replyp = __db_db_cursor_4007(&msg, cl); | |
218 | if (replyp == NULL) { | |
219 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
220 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
221 | ret = DB_NOSERVER; | |
222 | goto out; | |
223 | } | |
224 | @@ -956,7 +956,7 @@ __dbcl_db_del(dbp, txnp, key, flags) | |
225 | ||
226 | replyp = __db_db_del_4007(&msg, cl); | |
227 | if (replyp == NULL) { | |
228 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
229 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
230 | ret = DB_NOSERVER; | |
231 | goto out; | |
232 | } | |
233 | @@ -1015,7 +1015,7 @@ __dbcl_db_get(dbp, txnp, key, data, flag | |
234 | ||
235 | replyp = __db_db_get_4007(&msg, cl); | |
236 | if (replyp == NULL) { | |
237 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
238 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
239 | ret = DB_NOSERVER; | |
240 | goto out; | |
241 | } | |
242 | @@ -1054,7 +1054,7 @@ __dbcl_db_get_bt_minkey(dbp, minkeyp) | |
243 | ||
244 | replyp = __db_db_get_bt_minkey_4007(&msg, cl); | |
245 | if (replyp == NULL) { | |
246 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
247 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
248 | ret = DB_NOSERVER; | |
249 | goto out; | |
250 | } | |
251 | @@ -1097,7 +1097,7 @@ __dbcl_db_get_dbname(dbp, filenamep, dbn | |
252 | ||
253 | replyp = __db_db_get_dbname_4007(&msg, cl); | |
254 | if (replyp == NULL) { | |
255 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
256 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
257 | ret = DB_NOSERVER; | |
258 | goto out; | |
259 | } | |
260 | @@ -1140,7 +1140,7 @@ __dbcl_db_get_encrypt_flags(dbp, flagsp) | |
261 | ||
262 | replyp = __db_db_get_encrypt_flags_4007(&msg, cl); | |
263 | if (replyp == NULL) { | |
264 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
265 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
266 | ret = DB_NOSERVER; | |
267 | goto out; | |
268 | } | |
269 | @@ -1181,7 +1181,7 @@ __dbcl_db_get_flags(dbp, flagsp) | |
270 | ||
271 | replyp = __db_db_get_flags_4007(&msg, cl); | |
272 | if (replyp == NULL) { | |
273 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
274 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
275 | ret = DB_NOSERVER; | |
276 | goto out; | |
277 | } | |
278 | @@ -1222,7 +1222,7 @@ __dbcl_db_get_h_ffactor(dbp, ffactorp) | |
279 | ||
280 | replyp = __db_db_get_h_ffactor_4007(&msg, cl); | |
281 | if (replyp == NULL) { | |
282 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
283 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
284 | ret = DB_NOSERVER; | |
285 | goto out; | |
286 | } | |
287 | @@ -1263,7 +1263,7 @@ __dbcl_db_get_h_nelem(dbp, nelemp) | |
288 | ||
289 | replyp = __db_db_get_h_nelem_4007(&msg, cl); | |
290 | if (replyp == NULL) { | |
291 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
292 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
293 | ret = DB_NOSERVER; | |
294 | goto out; | |
295 | } | |
296 | @@ -1304,7 +1304,7 @@ __dbcl_db_get_lorder(dbp, lorderp) | |
297 | ||
298 | replyp = __db_db_get_lorder_4007(&msg, cl); | |
299 | if (replyp == NULL) { | |
300 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
301 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
302 | ret = DB_NOSERVER; | |
303 | goto out; | |
304 | } | |
305 | @@ -1345,7 +1345,7 @@ __dbcl_db_get_open_flags(dbp, flagsp) | |
306 | ||
307 | replyp = __db_db_get_open_flags_4007(&msg, cl); | |
308 | if (replyp == NULL) { | |
309 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
310 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
311 | ret = DB_NOSERVER; | |
312 | goto out; | |
313 | } | |
314 | @@ -1386,7 +1386,7 @@ __dbcl_db_get_pagesize(dbp, pagesizep) | |
315 | ||
316 | replyp = __db_db_get_pagesize_4007(&msg, cl); | |
317 | if (replyp == NULL) { | |
318 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
319 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
320 | ret = DB_NOSERVER; | |
321 | goto out; | |
322 | } | |
323 | @@ -1427,7 +1427,7 @@ __dbcl_db_get_priority(dbp, priorityp) | |
324 | ||
325 | replyp = __db_db_get_priority_4007(&msg, cl); | |
326 | if (replyp == NULL) { | |
327 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
328 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
329 | ret = DB_NOSERVER; | |
330 | goto out; | |
331 | } | |
332 | @@ -1468,7 +1468,7 @@ __dbcl_db_get_q_extentsize(dbp, extentsi | |
333 | ||
334 | replyp = __db_db_get_q_extentsize_4007(&msg, cl); | |
335 | if (replyp == NULL) { | |
336 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
337 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
338 | ret = DB_NOSERVER; | |
339 | goto out; | |
340 | } | |
341 | @@ -1509,7 +1509,7 @@ __dbcl_db_get_re_delim(dbp, delimp) | |
342 | ||
343 | replyp = __db_db_get_re_delim_4007(&msg, cl); | |
344 | if (replyp == NULL) { | |
345 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
346 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
347 | ret = DB_NOSERVER; | |
348 | goto out; | |
349 | } | |
350 | @@ -1550,7 +1550,7 @@ __dbcl_db_get_re_len(dbp, lenp) | |
351 | ||
352 | replyp = __db_db_get_re_len_4007(&msg, cl); | |
353 | if (replyp == NULL) { | |
354 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
355 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
356 | ret = DB_NOSERVER; | |
357 | goto out; | |
358 | } | |
359 | @@ -1591,7 +1591,7 @@ __dbcl_db_get_re_pad(dbp, padp) | |
360 | ||
361 | replyp = __db_db_get_re_pad_4007(&msg, cl); | |
362 | if (replyp == NULL) { | |
363 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
364 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
365 | ret = DB_NOSERVER; | |
366 | goto out; | |
367 | } | |
368 | @@ -1647,7 +1647,7 @@ __dbcl_db_join(dbp, curs, dbcp, flags) | |
369 | replyp = __db_db_join_4007(&msg, cl); | |
370 | __os_free(dbenv->env, msg.curs.curs_val); | |
371 | if (replyp == NULL) { | |
372 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
373 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
374 | ret = DB_NOSERVER; | |
375 | goto out; | |
376 | } | |
377 | @@ -1701,7 +1701,7 @@ __dbcl_db_key_range(dbp, txnp, key, rang | |
378 | ||
379 | replyp = __db_db_key_range_4007(&msg, cl); | |
380 | if (replyp == NULL) { | |
381 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
382 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
383 | ret = DB_NOSERVER; | |
384 | goto out; | |
385 | } | |
386 | @@ -1761,7 +1761,7 @@ __dbcl_db_open(dbp, txnp, name, subdb, t | |
387 | ||
388 | replyp = __db_db_open_4007(&msg, cl); | |
389 | if (replyp == NULL) { | |
390 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
391 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
392 | ret = DB_NOSERVER; | |
393 | goto out; | |
394 | } | |
395 | @@ -1828,7 +1828,7 @@ __dbcl_db_pget(dbp, txnp, skey, pkey, da | |
396 | ||
397 | replyp = __db_db_pget_4007(&msg, cl); | |
398 | if (replyp == NULL) { | |
399 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
400 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
401 | ret = DB_NOSERVER; | |
402 | goto out; | |
403 | } | |
404 | @@ -1887,7 +1887,7 @@ __dbcl_db_put(dbp, txnp, key, data, flag | |
405 | ||
406 | replyp = __db_db_put_4007(&msg, cl); | |
407 | if (replyp == NULL) { | |
408 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
409 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
410 | ret = DB_NOSERVER; | |
411 | goto out; | |
412 | } | |
413 | @@ -1938,7 +1938,7 @@ __dbcl_db_remove(dbp, name, subdb, flags | |
414 | ||
415 | replyp = __db_db_remove_4007(&msg, cl); | |
416 | if (replyp == NULL) { | |
417 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
418 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
419 | ret = DB_NOSERVER; | |
420 | goto out; | |
421 | } | |
422 | @@ -1994,7 +1994,7 @@ __dbcl_db_rename(dbp, name, subdb, newna | |
423 | ||
424 | replyp = __db_db_rename_4007(&msg, cl); | |
425 | if (replyp == NULL) { | |
426 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
427 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
428 | ret = DB_NOSERVER; | |
429 | goto out; | |
430 | } | |
431 | @@ -2034,7 +2034,7 @@ __dbcl_db_set_bt_minkey(dbp, minkey) | |
432 | ||
433 | replyp = __db_db_set_bt_minkey_4007(&msg, cl); | |
434 | if (replyp == NULL) { | |
435 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
436 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
437 | ret = DB_NOSERVER; | |
438 | goto out; | |
439 | } | |
440 | @@ -2079,7 +2079,7 @@ __dbcl_db_set_encrypt(dbp, passwd, flags | |
441 | ||
442 | replyp = __db_db_set_encrypt_4007(&msg, cl); | |
443 | if (replyp == NULL) { | |
444 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
445 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
446 | ret = DB_NOSERVER; | |
447 | goto out; | |
448 | } | |
449 | @@ -2119,7 +2119,7 @@ __dbcl_db_set_flags(dbp, flags) | |
450 | ||
451 | replyp = __db_db_set_flags_4007(&msg, cl); | |
452 | if (replyp == NULL) { | |
453 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
454 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
455 | ret = DB_NOSERVER; | |
456 | goto out; | |
457 | } | |
458 | @@ -2159,7 +2159,7 @@ __dbcl_db_set_h_ffactor(dbp, ffactor) | |
459 | ||
460 | replyp = __db_db_set_h_ffactor_4007(&msg, cl); | |
461 | if (replyp == NULL) { | |
462 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
463 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
464 | ret = DB_NOSERVER; | |
465 | goto out; | |
466 | } | |
467 | @@ -2199,7 +2199,7 @@ __dbcl_db_set_h_nelem(dbp, nelem) | |
468 | ||
469 | replyp = __db_db_set_h_nelem_4007(&msg, cl); | |
470 | if (replyp == NULL) { | |
471 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
472 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
473 | ret = DB_NOSERVER; | |
474 | goto out; | |
475 | } | |
476 | @@ -2239,7 +2239,7 @@ __dbcl_db_set_lorder(dbp, lorder) | |
477 | ||
478 | replyp = __db_db_set_lorder_4007(&msg, cl); | |
479 | if (replyp == NULL) { | |
480 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
481 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
482 | ret = DB_NOSERVER; | |
483 | goto out; | |
484 | } | |
485 | @@ -2279,7 +2279,7 @@ __dbcl_db_set_pagesize(dbp, pagesize) | |
486 | ||
487 | replyp = __db_db_set_pagesize_4007(&msg, cl); | |
488 | if (replyp == NULL) { | |
489 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
490 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
491 | ret = DB_NOSERVER; | |
492 | goto out; | |
493 | } | |
494 | @@ -2319,7 +2319,7 @@ __dbcl_db_set_priority(dbp, priority) | |
495 | ||
496 | replyp = __db_db_set_priority_4007(&msg, cl); | |
497 | if (replyp == NULL) { | |
498 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
499 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
500 | ret = DB_NOSERVER; | |
501 | goto out; | |
502 | } | |
503 | @@ -2359,7 +2359,7 @@ __dbcl_db_set_q_extentsize(dbp, extentsi | |
504 | ||
505 | replyp = __db_db_set_q_extentsize_4007(&msg, cl); | |
506 | if (replyp == NULL) { | |
507 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
508 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
509 | ret = DB_NOSERVER; | |
510 | goto out; | |
511 | } | |
512 | @@ -2399,7 +2399,7 @@ __dbcl_db_set_re_delim(dbp, delim) | |
513 | ||
514 | replyp = __db_db_set_re_delim_4007(&msg, cl); | |
515 | if (replyp == NULL) { | |
516 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
517 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
518 | ret = DB_NOSERVER; | |
519 | goto out; | |
520 | } | |
521 | @@ -2439,7 +2439,7 @@ __dbcl_db_set_re_len(dbp, len) | |
522 | ||
523 | replyp = __db_db_set_re_len_4007(&msg, cl); | |
524 | if (replyp == NULL) { | |
525 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
526 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
527 | ret = DB_NOSERVER; | |
528 | goto out; | |
529 | } | |
530 | @@ -2479,7 +2479,7 @@ __dbcl_db_set_re_pad(dbp, pad) | |
531 | ||
532 | replyp = __db_db_set_re_pad_4007(&msg, cl); | |
533 | if (replyp == NULL) { | |
534 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
535 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
536 | ret = DB_NOSERVER; | |
537 | goto out; | |
538 | } | |
539 | @@ -2525,7 +2525,7 @@ __dbcl_db_stat(dbp, txnp, sp, flags) | |
540 | ||
541 | replyp = __db_db_stat_4007(&msg, cl); | |
542 | if (replyp == NULL) { | |
543 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
544 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
545 | ret = DB_NOSERVER; | |
546 | goto out; | |
547 | } | |
548 | @@ -2565,7 +2565,7 @@ __dbcl_db_sync(dbp, flags) | |
549 | ||
550 | replyp = __db_db_sync_4007(&msg, cl); | |
551 | if (replyp == NULL) { | |
552 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
553 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
554 | ret = DB_NOSERVER; | |
555 | goto out; | |
556 | } | |
557 | @@ -2612,7 +2612,7 @@ __dbcl_db_truncate(dbp, txnp, countp, fl | |
558 | ||
559 | replyp = __db_db_truncate_4007(&msg, cl); | |
560 | if (replyp == NULL) { | |
561 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
562 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
563 | ret = DB_NOSERVER; | |
564 | goto out; | |
565 | } | |
566 | @@ -2650,7 +2650,7 @@ __dbcl_dbc_close(dbc) | |
567 | ||
568 | replyp = __db_dbc_close_4007(&msg, cl); | |
569 | if (replyp == NULL) { | |
570 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
571 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
572 | ret = DB_NOSERVER; | |
573 | goto out; | |
574 | } | |
575 | @@ -2691,7 +2691,7 @@ __dbcl_dbc_count(dbc, countp, flags) | |
576 | ||
577 | replyp = __db_dbc_count_4007(&msg, cl); | |
578 | if (replyp == NULL) { | |
579 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
580 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
581 | ret = DB_NOSERVER; | |
582 | goto out; | |
583 | } | |
584 | @@ -2731,7 +2731,7 @@ __dbcl_dbc_del(dbc, flags) | |
585 | ||
586 | replyp = __db_dbc_del_4007(&msg, cl); | |
587 | if (replyp == NULL) { | |
588 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
589 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
590 | ret = DB_NOSERVER; | |
591 | goto out; | |
592 | } | |
593 | @@ -2772,7 +2772,7 @@ __dbcl_dbc_dup(dbc, dbcp, flags) | |
594 | ||
595 | replyp = __db_dbc_dup_4007(&msg, cl); | |
596 | if (replyp == NULL) { | |
597 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
598 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
599 | ret = DB_NOSERVER; | |
600 | goto out; | |
601 | } | |
602 | @@ -2826,7 +2826,7 @@ __dbcl_dbc_get(dbc, key, data, flags) | |
603 | ||
604 | replyp = __db_dbc_get_4007(&msg, cl); | |
605 | if (replyp == NULL) { | |
606 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
607 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
608 | ret = DB_NOSERVER; | |
609 | goto out; | |
610 | } | |
611 | @@ -2865,7 +2865,7 @@ __dbcl_dbc_get_priority(dbc, priorityp) | |
612 | ||
613 | replyp = __db_dbc_get_priority_4007(&msg, cl); | |
614 | if (replyp == NULL) { | |
615 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
616 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
617 | ret = DB_NOSERVER; | |
618 | goto out; | |
619 | } | |
620 | @@ -2928,7 +2928,7 @@ __dbcl_dbc_pget(dbc, skey, pkey, data, f | |
621 | ||
622 | replyp = __db_dbc_pget_4007(&msg, cl); | |
623 | if (replyp == NULL) { | |
624 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
625 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
626 | ret = DB_NOSERVER; | |
627 | goto out; | |
628 | } | |
629 | @@ -2982,7 +2982,7 @@ __dbcl_dbc_put(dbc, key, data, flags) | |
630 | ||
631 | replyp = __db_dbc_put_4007(&msg, cl); | |
632 | if (replyp == NULL) { | |
633 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
634 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
635 | ret = DB_NOSERVER; | |
636 | goto out; | |
637 | } | |
638 | @@ -3022,7 +3022,7 @@ __dbcl_dbc_set_priority(dbc, priority) | |
639 | ||
640 | replyp = __db_dbc_set_priority_4007(&msg, cl); | |
641 | if (replyp == NULL) { | |
642 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
643 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
644 | ret = DB_NOSERVER; | |
645 | goto out; | |
646 | } | |
647 | @@ -3060,7 +3060,7 @@ __dbcl_txn_abort(txnp) | |
648 | ||
649 | replyp = __db_txn_abort_4007(&msg, cl); | |
650 | if (replyp == NULL) { | |
651 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
652 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
653 | ret = DB_NOSERVER; | |
654 | goto out; | |
655 | } | |
656 | @@ -3100,7 +3100,7 @@ __dbcl_txn_commit(txnp, flags) | |
657 | ||
658 | replyp = __db_txn_commit_4007(&msg, cl); | |
659 | if (replyp == NULL) { | |
660 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
661 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
662 | ret = DB_NOSERVER; | |
663 | goto out; | |
664 | } | |
665 | @@ -3140,7 +3140,7 @@ __dbcl_txn_discard(txnp, flags) | |
666 | ||
667 | replyp = __db_txn_discard_4007(&msg, cl); | |
668 | if (replyp == NULL) { | |
669 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
670 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
671 | ret = DB_NOSERVER; | |
672 | goto out; | |
673 | } | |
674 | @@ -3180,7 +3180,7 @@ __dbcl_txn_prepare(txnp, gid) | |
675 | ||
676 | replyp = __db_txn_prepare_4007(&msg, cl); | |
677 | if (replyp == NULL) { | |
678 | - __db_errx(dbenv->env, clnt_sperror(cl, "Berkeley DB")); | |
679 | + __db_errx(dbenv->env, "%s", clnt_sperror(cl, "Berkeley DB")); | |
680 | ret = DB_NOSERVER; | |
681 | goto out; | |
682 | } |