aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-07-16 20:36:50 +0000
committerChristian Grothoff <christian@grothoff.org>2011-07-16 20:36:50 +0000
commitb80d1dd37e4417a110602712fa642060de4a067d (patch)
tree687090cb3449289b3fa0abeb69807c9b2be48c63
parentf138394d15bda25c7aae11ef6aa86f580cf15316 (diff)
downloadgnunet-b80d1dd37e4417a110602712fa642060de4a067d.tar.gz
gnunet-b80d1dd37e4417a110602712fa642060de4a067d.zip
checkret
-rw-r--r--contrib/timeout_watchdog.c2
-rw-r--r--src/datacache/plugin_datacache_sqlite.c12
2 files changed, 11 insertions, 3 deletions
diff --git a/contrib/timeout_watchdog.c b/contrib/timeout_watchdog.c
index 5fbe7e339..a33f67adc 100644
--- a/contrib/timeout_watchdog.c
+++ b/contrib/timeout_watchdog.c
@@ -94,7 +94,7 @@ main (int argc, char *argv[])
94 { 94 {
95 /* int setpgrp(pid_t pid, pid_t pgid); is not working on this machine */ 95 /* int setpgrp(pid_t pid, pid_t pgid); is not working on this machine */
96 //setpgrp (0, pid_t gpid); 96 //setpgrp (0, pid_t gpid);
97 if (-1 !- gpid) 97 if (-1 != gpid)
98 setpgid (0, gpid); 98 setpgid (0, gpid);
99 execvp (argv[2], &argv[2]); 99 execvp (argv[2], &argv[2]);
100 exit (1); 100 exit (1);
diff --git a/src/datacache/plugin_datacache_sqlite.c b/src/datacache/plugin_datacache_sqlite.c
index 4c429c1b4..eb24f5423 100644
--- a/src/datacache/plugin_datacache_sqlite.c
+++ b/src/datacache/plugin_datacache_sqlite.c
@@ -203,8 +203,16 @@ sqlite_plugin_get (void *cls,
203 sqlite3_errmsg (plugin->dbh)); 203 sqlite3_errmsg (plugin->dbh));
204 return 0; 204 return 0;
205 } 205 }
206 sqlite3_bind_blob (stmt, 1, key, sizeof (GNUNET_HashCode), 206 if (GNUNET_OK !=
207 SQLITE_TRANSIENT); 207 sqlite3_bind_blob (stmt, 1, key, sizeof (GNUNET_HashCode),
208 SQLITE_TRANSIENT))
209 {
210 LOG_SQLITE (plugin->dbh,
211 GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
212 "sqlite3_bind_xxx");
213 sqlite3_finalize (stmt);
214 return 0;
215 }
208 sqlite3_bind_int (stmt, 2, type); 216 sqlite3_bind_int (stmt, 2, type);
209 ntime = (int64_t) now.abs_value; 217 ntime = (int64_t) now.abs_value;
210 GNUNET_assert (ntime >= 0); 218 GNUNET_assert (ntime >= 0);