donau

commit ef4d0af62bb736122146842a12213cdae25eb728
parent 1e248afd8c0a21743a3f140881b80fea76ca2a78
Author: Christian Grothoff <grothoff@gnunet.org>
Date:   Sat,  2 Aug 2025 12:40:19 +0200

fix paths

Diffstat:
M
src/donaudb/donaudb-postgres.conf
 | 
2
+-
M
src/donaudb/pg_create_tables.c
 | 
2
--
M
src/donaudb/plugin_donaudb_postgres.c
 | 
17
++++++++---------
M
src/donaudb/test-donau-db-postgres.conf
 | 
2
+-
M
src/pq/Makefile.am
 | 
5
+++--

5 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/src/donaudb/donaudb-postgres.conf b/src/donaudb/donaudb-postgres.conf
@@ -3,4 +3,4 @@ CONFIG = "postgres:///donaucheck"
 
 # Where are the SQL files to setup our tables?
 # Important: this MUST end with a "/"!
-SQL_DIR = $DATADIR/sql/
+SQL_DIR = ${DATADIR}sql/
diff --git a/src/donaudb/pg_create_tables.c b/src/donaudb/pg_create_tables.c
@@ -36,7 +36,6 @@ DH_PG_create_tables (void *cls)
   struct GNUNET_PQ_QueryParam params[] = {
     GNUNET_PQ_query_param_end
   };
-
   struct GNUNET_PQ_PreparedStatement ps[] = {
     GNUNET_PQ_make_prepare ("create_tables",
                             "CALL"
@@ -49,7 +48,6 @@ DH_PG_create_tables (void *cls)
     GNUNET_PQ_EXECUTE_STATEMENT_END
   };
 
-
   conn = GNUNET_PQ_connect_with_cfg (pg->cfg,
                                      "donaudb-postgres",
                                      "donau-",
diff --git a/src/donaudb/plugin_donaudb_postgres.c b/src/donaudb/plugin_donaudb_postgres.c
@@ -71,14 +71,14 @@
  * @param conn SQL connection that was used
  */
 #define BREAK_DB_ERR(result,conn) do {                                  \
-    GNUNET_break (0);                                                   \
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,                                \
-                "Database failure: %s/%s/%s/%s/%s",                     \
-                PQresultErrorField (result, PG_DIAG_MESSAGE_PRIMARY),   \
-                PQresultErrorField (result, PG_DIAG_MESSAGE_DETAIL),    \
-                PQresultErrorMessage (result),                          \
-                PQresStatus (PQresultStatus (result)),                  \
-                PQerrorMessage (conn));                                 \
+          GNUNET_break (0);                                                   \
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,                                \
+                      "Database failure: %s/%s/%s/%s/%s",                     \
+                      PQresultErrorField (result, PG_DIAG_MESSAGE_PRIMARY),   \
+                      PQresultErrorField (result, PG_DIAG_MESSAGE_DETAIL),    \
+                      PQresultErrorMessage (result),                          \
+                      PQresStatus (PQresultStatus (result)),                  \
+                      PQerrorMessage (conn));                                 \
 } while (0)
 
 
@@ -156,7 +156,6 @@ libtaler_plugin_donaudb_postgres_init (void *cls)
   const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
   struct PostgresClosure *pg;
   struct DONAUDB_Plugin *plugin;
-  // unsigned long long dpl;
 
   pg = GNUNET_new (struct PostgresClosure);
   pg->cfg = cfg;
diff --git a/src/donaudb/test-donau-db-postgres.conf b/src/donaudb/test-donau-db-postgres.conf
@@ -12,7 +12,7 @@ BASE_URL = http://localhost/
 CONFIG = postgres:///donaucheck
 
 # Where are the SQL files to setup our tables?
-SQL_DIR = $DATADIR/sql/donau/
+SQL_DIR = ${DATADIR}sql/
 
 [donaudb]
 
diff --git a/src/pq/Makefile.am b/src/pq/Makefile.am
@@ -14,8 +14,9 @@ libdonaupq_la_SOURCES = \
   pq_result_helper.c
 libdonaupq_la_LIBADD = \
   $(top_builddir)/src/util/libdonauutil.la  \
-  -lgnunetutil -ljansson \
+  -lgnunetutil \
   -lgnunetpq \
+  -ljansson \
   -lpq \
   $(XLIB)
 libdonaupq_la_LDFLAGS = \
@@ -36,8 +37,8 @@ test_pq_SOURCES = \
 test_pq_LDADD = \
   libdonaupq.la \
   $(top_builddir)/src/util/libdonauutil.la  \
-  -ltalerpq \
   -ltalerutil \
+  -ltalerpq \
   -lgnunetpq \
   -lgnunetutil \
   -ljansson \