diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2010-10-27 09:38:04 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2010-10-27 09:38:04 +0000 |
commit | 5be02c06ab32edcc8ab3ea6b8ff291ba946ed831 (patch) | |
tree | 86a488d381ff8443f6b9de6a23708edb042a75f2 /src/datacache/plugin_datacache_sqlite.c | |
parent | 06076559b84c1053d82929c05620ab0bd60b9c5f (diff) | |
download | gnunet-5be02c06ab32edcc8ab3ea6b8ff291ba946ed831.tar.gz gnunet-5be02c06ab32edcc8ab3ea6b8ff291ba946ed831.zip |
Refactoring gnunet time
Diffstat (limited to 'src/datacache/plugin_datacache_sqlite.c')
-rw-r--r-- | src/datacache/plugin_datacache_sqlite.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/datacache/plugin_datacache_sqlite.c b/src/datacache/plugin_datacache_sqlite.c index 5c304bd8a..95b65cb10 100644 --- a/src/datacache/plugin_datacache_sqlite.c +++ b/src/datacache/plugin_datacache_sqlite.c | |||
@@ -112,9 +112,9 @@ sqlite_plugin_put (void *cls, | |||
112 | "PUT", | 112 | "PUT", |
113 | (unsigned int) size, | 113 | (unsigned int) size, |
114 | GNUNET_h2s (key), | 114 | GNUNET_h2s (key), |
115 | (unsigned long long) GNUNET_TIME_absolute_get_remaining (discard_time).value); | 115 | (unsigned long long) GNUNET_TIME_absolute_get_remaining (discard_time).rel_value); |
116 | #endif | 116 | #endif |
117 | dval = (int64_t) discard_time.value; | 117 | dval = (int64_t) discard_time.abs_value; |
118 | if (dval < 0) | 118 | if (dval < 0) |
119 | dval = INT64_MAX; | 119 | dval = INT64_MAX; |
120 | if (sq_prepare (plugin->dbh, | 120 | if (sq_prepare (plugin->dbh, |
@@ -206,9 +206,9 @@ sqlite_plugin_get (void *cls, | |||
206 | sqlite3_bind_blob (stmt, 1, key, sizeof (GNUNET_HashCode), | 206 | sqlite3_bind_blob (stmt, 1, key, sizeof (GNUNET_HashCode), |
207 | SQLITE_TRANSIENT); | 207 | SQLITE_TRANSIENT); |
208 | sqlite3_bind_int (stmt, 2, type); | 208 | sqlite3_bind_int (stmt, 2, type); |
209 | ntime = (int64_t) now.value; | 209 | ntime = (int64_t) now.abs_value; |
210 | GNUNET_assert (ntime >= 0); | 210 | GNUNET_assert (ntime >= 0); |
211 | sqlite3_bind_int64 (stmt, 3, now.value); | 211 | sqlite3_bind_int64 (stmt, 3, now.abs_value); |
212 | if (SQLITE_ROW != sqlite3_step (stmt)) | 212 | if (SQLITE_ROW != sqlite3_step (stmt)) |
213 | { | 213 | { |
214 | LOG_SQLITE (plugin->dbh, | 214 | LOG_SQLITE (plugin->dbh, |
@@ -242,13 +242,13 @@ sqlite_plugin_get (void *cls, | |||
242 | sqlite3_bind_blob (stmt, 1, key, sizeof (GNUNET_HashCode), | 242 | sqlite3_bind_blob (stmt, 1, key, sizeof (GNUNET_HashCode), |
243 | SQLITE_TRANSIENT); | 243 | SQLITE_TRANSIENT); |
244 | sqlite3_bind_int (stmt, 2, type); | 244 | sqlite3_bind_int (stmt, 2, type); |
245 | sqlite3_bind_int64 (stmt, 3, now.value); | 245 | sqlite3_bind_int64 (stmt, 3, now.abs_value); |
246 | if (sqlite3_step (stmt) != SQLITE_ROW) | 246 | if (sqlite3_step (stmt) != SQLITE_ROW) |
247 | break; | 247 | break; |
248 | size = sqlite3_column_bytes (stmt, 0); | 248 | size = sqlite3_column_bytes (stmt, 0); |
249 | dat = sqlite3_column_blob (stmt, 0); | 249 | dat = sqlite3_column_blob (stmt, 0); |
250 | exp.value = sqlite3_column_int64 (stmt, 1); | 250 | exp.abs_value = sqlite3_column_int64 (stmt, 1); |
251 | ntime = (int64_t) exp.value; | 251 | ntime = (int64_t) exp.abs_value; |
252 | if (ntime == INT64_MAX) | 252 | if (ntime == INT64_MAX) |
253 | exp = GNUNET_TIME_UNIT_FOREVER_ABS; | 253 | exp = GNUNET_TIME_UNIT_FOREVER_ABS; |
254 | cnt++; | 254 | cnt++; |