[GNUnet-SVN] [taler-merchant] branch master updated: avoid uninitialized value

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 3fd4f33  avoid uninitialized value
3fd4f33 is described below

commit 3fd4f33ce804a001f40277a7aa2c3721ae6990f9
Author: Florian Dold <address@hidden>
AuthorDate: Fri Feb 2 23:21:42 2018 +0100

    avoid uninitialized value
---
 .gitignore                                  |  2 +-
 doc/Makefile.am                             | 22 +++++++++++++++++++---
 doc/arch.dot                                | 23 -----------------------
 doc/manual.texi                             |  2 +-
 src/backend/taler-merchant-httpd_proposal.c |  2 +-
 src/lib/test_merchant_api.c                 |  1 +
 6 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index f2f8d1f..ec1147a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,7 +38,7 @@ doc/*
 !doc/*.texi
 !doc/*.css
 !doc/*.1
-doc/version.texi
+doc/version-*.texi
 !doc/*.am
 !doc/*.sh
 !doc/*.js
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a755143..ba34694 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -8,20 +8,36 @@ arch.pdf: arch.dot
 arch.png: arch.dot
        dot -Tpng arch.dot > arch.png
 
+merchant-api-%.%: merchant-api.content.texi
+
 AM_MAKEINFOHTMLFLAGS = --no-split --css-ref=docstyle.css 
--css-ref=brown-paper.css
 
 man_MANS = \
   taler-merchant-generate-payments.1 \
   taler-merchant-httpd.1
 
-info_TEXINFOS = manual.texi
+info_TEXINFOS = \
+  manual.texi \
+  merchant-api-python.texi \
+  merchant-api-curl.texi
+
+manual_TEXINFOS = \
+  version-manual.texi \
+  merchant-api.content.texi
+
+merchant_api_python_TEXINFOS = \
+  version-merchant-api-python.texi \
+  merchant-api.content.texi
 
-manual_TEXINFOS = version.texi
+merchant_api_curl_TEXINFOS = \
+  version-merchant-api-curl.texi \
+  merchant-api.content.texi
 
 extra_TEXINFOS = \
   fdl-1.3.texi \
   agpl.texi \
-  syntax.texi
+  syntax.texi \
+  merchant-api.content.texi
 
 EXTRA_DIST = \
   arch.dot \
diff --git a/doc/arch.dot b/doc/arch.dot
deleted file mode 100644
index acc9ed8..0000000
--- a/doc/arch.dot
+++ /dev/null
@@ -1,23 +0,0 @@
-digraph G {
-
-  user[label="Customer browser"];
-  admin[label="Shop admin"];
-  Backend [color="blue"];
-  subgraph cluster_0 {
-    Frontend;
-    Backoffice;
-    Backend;
-    DBMS;
-    label="Shop server";
-  }
-  subgraph cluster_1 {
-    Exchange;
-    label="Exchange";
-  }
-  user->Frontend;
-  admin->Backoffice;
-  Frontend->Backend;
-  Backoffice->Backend;
-  Backend->DBMS;
-  Backend->Exchange;
-}
diff --git a/doc/manual.texi b/doc/manual.texi
index d8eeb0e..677f7de 100644
--- a/doc/manual.texi
+++ b/doc/manual.texi
@@ -1,7 +1,7 @@
 \input texinfo @c -*-texinfo-*-
 @c %**start of header
 @setfilename manual.info
address@hidden version.texi
address@hidden version-manual.texi
 @settitle The GNU Taler merchant backend operator tutorial @value{VERSION}
 
 @include syntax.texi
diff --git a/src/backend/taler-merchant-httpd_proposal.c 
b/src/backend/taler-merchant-httpd_proposal.c
index 64bd5e9..1dffaf5 100644
--- a/src/backend/taler-merchant-httpd_proposal.c
+++ b/src/backend/taler-merchant-httpd_proposal.c
@@ -567,7 +567,7 @@ MH_handler_proposal_lookup (struct TMH_RequestHandler *rh,
   enum GNUNET_DB_QueryStatus qs;
   json_t *contract_terms;
   struct MerchantInstance *mi;
-  char *last_session_id;
+  char *last_session_id = NULL;
 
   instance = MHD_lookup_connection_value (connection,
                                           MHD_GET_ARGUMENT_KIND,
diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c
index 5a92e9c..c8ae9f8 100644
--- a/src/lib/test_merchant_api.c
+++ b/src/lib/test_merchant_api.c
@@ -1595,6 +1595,7 @@ proposal_lookup_initial_cb (void *cls,
   if (cmd->expected_response_code != http_status)
   {
     fail (is);
+    return;
   }
 
   cmd->details.proposal.hash = *hash;

-- 
To stop receiving notification emails like this one, please contact
address@hidden