aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------contrib/build-common0
-rw-r--r--src/pq/pq_connect.c14
2 files changed, 7 insertions, 7 deletions
diff --git a/contrib/build-common b/contrib/build-common
Subproject d81bbfabc2538932f631d3946bd6a9b95182b4f Subproject 1915a74bbb4cd2ae9bc541a382dfebc37064a2f
diff --git a/src/pq/pq_connect.c b/src/pq/pq_connect.c
index 31ee59b51..cc064f48d 100644
--- a/src/pq/pq_connect.c
+++ b/src/pq/pq_connect.c
@@ -147,7 +147,7 @@ int
147GNUNET_PQ_run_sql (struct GNUNET_PQ_Context *db, 147GNUNET_PQ_run_sql (struct GNUNET_PQ_Context *db,
148 const char *load_path) 148 const char *load_path)
149{ 149{
150 size_t slen = strlen (db->load_path) + 10; 150 size_t slen = strlen (load_path) + 10;
151 151
152 for (unsigned int i = 0; i<10000; i++) 152 for (unsigned int i = 0; i<10000; i++)
153 { 153 {
@@ -155,11 +155,11 @@ GNUNET_PQ_run_sql (struct GNUNET_PQ_Context *db,
155 struct GNUNET_OS_Process *psql; 155 struct GNUNET_OS_Process *psql;
156 enum GNUNET_OS_ProcessStatusType type; 156 enum GNUNET_OS_ProcessStatusType type;
157 unsigned long code; 157 unsigned long code;
158 158
159 GNUNET_snprintf (buf, 159 GNUNET_snprintf (buf,
160 sizeof (buf), 160 sizeof (buf),
161 "%s%04u.sql", 161 "%s%04u.sql",
162 db->load_path, 162 load_path,
163 i); 163 i);
164 if (GNUNET_YES != 164 if (GNUNET_YES !=
165 GNUNET_DISK_file_test (buf)) 165 GNUNET_DISK_file_test (buf))
@@ -251,10 +251,10 @@ GNUNET_PQ_reconnect (struct GNUNET_PQ_Context *db)
251 &pq_notice_processor_cb, 251 &pq_notice_processor_cb,
252 db); 252 db);
253 if ( (NULL != db->load_path) && 253 if ( (NULL != db->load_path) &&
254 (GNUNET_OK != 254 (GNUNET_OK !=
255 GNUNET_PQ_run_sql (db, 255 GNUNET_PQ_run_sql (db,
256 db->load_path)) ) 256 db->load_path)) )
257 { 257 {
258 PQfinish (db->conn); 258 PQfinish (db->conn);
259 db->conn = NULL; 259 db->conn = NULL;
260 return; 260 return;