diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-09-28 09:44:18 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-09-28 09:44:18 +0000 |
commit | 1543f694845cf42109b04554f1896a3563de539c (patch) | |
tree | 8760b8a18087005a4d8712f5d90f61e1f8f9ae84 /src/namestore/plugin_namestore_sqlite.c | |
parent | f0fe130b2cd4295c351832bed9d566243a737cfb (diff) | |
download | gnunet-1543f694845cf42109b04554f1896a3563de539c.tar.gz gnunet-1543f694845cf42109b04554f1896a3563de539c.zip |
-simplify
Diffstat (limited to 'src/namestore/plugin_namestore_sqlite.c')
-rw-r--r-- | src/namestore/plugin_namestore_sqlite.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c index 569f10f5b..477e7bb16 100644 --- a/src/namestore/plugin_namestore_sqlite.c +++ b/src/namestore/plugin_namestore_sqlite.c | |||
@@ -287,10 +287,9 @@ database_setup (struct Plugin *plugin) | |||
287 | 287 | ||
288 | create_indices (plugin->dbh); | 288 | create_indices (plugin->dbh); |
289 | 289 | ||
290 | #define ALL "zone_key, record_name, record_count, record_data, block_expiration_time, signature" | ||
291 | if ((sq_prepare | 290 | if ((sq_prepare |
292 | (plugin->dbh, | 291 | (plugin->dbh, |
293 | "INSERT INTO ns091records (" ALL ", zone_delegation, zone_hash, record_name_hash, rvalue) VALUES " | 292 | "INSERT INTO ns091records (zone_key, record_name, record_count, record_data, block_expiration_time, signature, zone_delegation, zone_hash, record_name_hash, rvalue) VALUES " |
294 | "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", | 293 | "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", |
295 | &plugin->put_records) != SQLITE_OK) || | 294 | &plugin->put_records) != SQLITE_OK) || |
296 | (sq_prepare | 295 | (sq_prepare |
@@ -299,27 +298,27 @@ database_setup (struct Plugin *plugin) | |||
299 | &plugin->remove_records) != SQLITE_OK) || | 298 | &plugin->remove_records) != SQLITE_OK) || |
300 | (sq_prepare | 299 | (sq_prepare |
301 | (plugin->dbh, | 300 | (plugin->dbh, |
302 | "SELECT " ALL | 301 | "SELECT zone_key, record_name, record_count, record_data, block_expiration_time, signature" |
303 | " FROM ns091records WHERE zone_hash=? AND record_name_hash=? ORDER BY rvalue LIMIT 1 OFFSET ?", | 302 | " FROM ns091records WHERE zone_hash=? AND record_name_hash=? ORDER BY rvalue LIMIT 1 OFFSET ?", |
304 | &plugin->iterate_records) != SQLITE_OK) || | 303 | &plugin->iterate_records) != SQLITE_OK) || |
305 | (sq_prepare | 304 | (sq_prepare |
306 | (plugin->dbh, | 305 | (plugin->dbh, |
307 | "SELECT " ALL | 306 | "SELECT zone_key, record_name, record_count, record_data, block_expiration_time, signature" |
308 | " FROM ns091records WHERE zone_hash=? ORDER BY rvalue LIMIT 1 OFFSET ?", | 307 | " FROM ns091records WHERE zone_hash=? ORDER BY rvalue LIMIT 1 OFFSET ?", |
309 | &plugin->iterate_by_zone) != SQLITE_OK) || | 308 | &plugin->iterate_by_zone) != SQLITE_OK) || |
310 | (sq_prepare | 309 | (sq_prepare |
311 | (plugin->dbh, | 310 | (plugin->dbh, |
312 | "SELECT " ALL | 311 | "SELECT zone_key, record_name, record_count, record_data, block_expiration_time, signature" |
313 | " FROM ns091records WHERE record_name_hash=? ORDER BY rvalue LIMIT 1 OFFSET ?", | 312 | " FROM ns091records WHERE record_name_hash=? ORDER BY rvalue LIMIT 1 OFFSET ?", |
314 | &plugin->iterate_by_name) != SQLITE_OK) || | 313 | &plugin->iterate_by_name) != SQLITE_OK) || |
315 | (sq_prepare | 314 | (sq_prepare |
316 | (plugin->dbh, | 315 | (plugin->dbh, |
317 | "SELECT " ALL | 316 | "SELECT zone_key, record_name, record_count, record_data, block_expiration_time, signature" |
318 | " FROM ns091records ORDER BY rvalue LIMIT 1 OFFSET ?", | 317 | " FROM ns091records ORDER BY rvalue LIMIT 1 OFFSET ?", |
319 | &plugin->iterate_all) != SQLITE_OK) || | 318 | &plugin->iterate_all) != SQLITE_OK) || |
320 | (sq_prepare | 319 | (sq_prepare |
321 | (plugin->dbh, | 320 | (plugin->dbh, |
322 | "SELECT " ALL | 321 | "SELECT zone_key, record_name, record_count, record_data, block_expiration_time, signature" |
323 | " FROM ns091records WHERE zone_hash=? AND zone_delegation=?", | 322 | " FROM ns091records WHERE zone_hash=? AND zone_delegation=?", |
324 | &plugin->zone_to_name) != SQLITE_OK) || | 323 | &plugin->zone_to_name) != SQLITE_OK) || |
325 | (sq_prepare | 324 | (sq_prepare |
@@ -330,7 +329,6 @@ database_setup (struct Plugin *plugin) | |||
330 | LOG_SQLITE (plugin,GNUNET_ERROR_TYPE_ERROR, "precompiling"); | 329 | LOG_SQLITE (plugin,GNUNET_ERROR_TYPE_ERROR, "precompiling"); |
331 | return GNUNET_SYSERR; | 330 | return GNUNET_SYSERR; |
332 | } | 331 | } |
333 | #undef ALL | ||
334 | return GNUNET_OK; | 332 | return GNUNET_OK; |
335 | } | 333 | } |
336 | 334 | ||