[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r31789 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r31789 - gnunet/src/testbed |
Date: |
Sun, 5 Jan 2014 20:39:09 +0100 |
Author: harsha
Date: 2014-01-05 20:39:09 +0100 (Sun, 05 Jan 2014)
New Revision: 31789
Modified:
gnunet/src/testbed/gnunet-daemon-testbed-underlay.c
Log:
- fix ftbfs
Modified: gnunet/src/testbed/gnunet-daemon-testbed-underlay.c
===================================================================
--- gnunet/src/testbed/gnunet-daemon-testbed-underlay.c 2014-01-04 02:26:49 UTC
(rev 31788)
+++ gnunet/src/testbed/gnunet-daemon-testbed-underlay.c 2014-01-05 19:39:09 UTC
(rev 31789)
@@ -45,11 +45,21 @@
#define DEBUG(...) \
LOG (GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
+/**
+ * Log an error message at log-level 'level' that indicates
+ * a failure of the command 'cmd' on file 'filename'
+ * with the message given by strerror(errno).
+ */
+#define LOG_SQLITE(db, msg, level, cmd) \
+ do { \
+ GNUNET_log_from (level, "sqlite", _("`%s' failed at %s:%d with error:
%s\n"), \
+ cmd, __FILE__,__LINE__, sqlite3_errmsg(db)); \
+ if (msg != NULL) \
+ GNUNET_asprintf(msg, _("`%s' failed at %s:%u with error: %s"), cmd, \
+ __FILE__, __LINE__, sqlite3_errmsg(db)); \
+ } while(0)
-#define LOG_SQLITE_ERROR(ret) \
- LOG (GNUNET_ERROR_TYPE_ERROR, "sqlite error: %s", sqlite3_errstr (ret))
-
/**
* Allow access from the peers read from the whitelist
*/
@@ -341,12 +351,12 @@
if (SQLITE_OK != (ret = sqlite3_prepare_v2 (db, query_bl, -1, &stmt_bl,
NULL)))
{
- LOG_SQLITE_ERROR (ret);
+ LOG_SQLITE (db, NULL, GNUNET_ERROR_TYPE_ERROR, "sqlite3_prepare_v2");
return GNUNET_SYSERR;
}
if (SQLITE_OK != (ret = sqlite3_bind_int (stmt_bl, 1, pid)))
{
- LOG_SQLITE_ERROR (ret);
+ LOG_SQLITE (db, NULL, GNUNET_ERROR_TYPE_ERROR, "sqlite3_bind_int");
sqlite3_finalize (stmt_bl);
return GNUNET_SYSERR;
}
@@ -388,12 +398,12 @@
if (SQLITE_OK != (ret = sqlite3_prepare_v2 (db, query_wl, -1, &stmt_wl,
NULL)))
{
- LOG_SQLITE_ERROR (ret);
+ LOG_SQLITE (db, NULL, GNUNET_ERROR_TYPE_ERROR, "sqlite3_prepare_v2");
return GNUNET_SYSERR;
}
if (SQLITE_OK != (ret = sqlite3_bind_int (stmt_wl, 1, pid)))
{
- LOG_SQLITE_ERROR (ret);
+ LOG_SQLITE (db, NULL, GNUNET_ERROR_TYPE_ERROR, "sqlite3_bind_int");
sqlite3_finalize (stmt_wl);
return GNUNET_SYSERR;
}
@@ -461,7 +471,13 @@
}
if (SQLITE_OK != (ret = sqlite3_open_v2 (dbfile, &db, SQLITE_OPEN_READONLY,
NULL)))
{
- LOG_SQLITE_ERROR (ret);
+ if (NULL != db)
+ {
+ LOG_SQLITE (db, NULL, GNUNET_ERROR_TYPE_ERROR, "sqlite_open_v2");
+ sqlite3_close (db);
+ }
+ else
+ LOG (GNUNET_ERROR_TYPE_ERROR, "Cannot open sqlite file %s\n", dbfile);
GNUNET_free (dbfile);
return;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r31789 - gnunet/src/testbed,
gnunet <=