summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2021-04-28 15:40:27 +0200
committerChristian Grothoff <christian@grothoff.org>2021-04-28 15:40:27 +0200
commit9f17c97dac2b745ae26588ea524f287e76771433 (patch)
tree05a1bd13e0f0b535b663131aa9eab9cdb2df3d1f
parentbb282c5f8dfb9bdc952282d6969c47b717a21c9e (diff)
parent0bec10b176ef351d49cd29b0dfd0d79d9c6ab367 (diff)
downloadsync-9f17c97dac2b745ae26588ea524f287e76771433.tar.gz
sync-9f17c97dac2b745ae26588ea524f287e76771433.tar.bz2
sync-9f17c97dac2b745ae26588ea524f287e76771433.zip
Merge branch 'master' of git+ssh://git.taler.net/sync
-rw-r--r--configure.ac3
-rw-r--r--src/sync/sync-httpd_backup_post.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 192007a..2bcb184 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,8 @@ AS_IF([test "x$doc_only" != xyes],[
AC_PROG_CC
AC_PROG_CC_C99
-CFLAGS="-Wall $CFLAGS"
+# Force some CFLAGS
+CFLAGS="-Wall -Wno-address-of-packed-member $CFLAGS"
# Checks for header files.
AC_CHECK_HEADERS([stdint.h stdlib.h string.h unistd.h])
diff --git a/src/sync/sync-httpd_backup_post.c b/src/sync/sync-httpd_backup_post.c
index 4993e0f..8dd1fc2 100644
--- a/src/sync/sync-httpd_backup_post.c
+++ b/src/sync/sync-httpd_backup_post.c
@@ -319,7 +319,7 @@ proposal_cb (void *cls,
"Backend returned status %u/%u\n",
por->hr.http_status,
(unsigned int) por->hr.ec);
- GNUNET_break (0);
+ GNUNET_break_op (0);
bc->resp = TALER_MHD_make_json_pack (
"{s:I, s:s, s:I, s:I, s:O?}",
"code",
@@ -333,7 +333,7 @@ proposal_cb (void *cls,
"backend-reply",
por->hr.reply);
GNUNET_assert (NULL != bc->resp);
- bc->response_code = MHD_HTTP_FAILED_DEPENDENCY;
+ bc->response_code = MHD_HTTP_BAD_GATEWAY;
return;
}
GNUNET_log (GNUNET_ERROR_TYPE_INFO,