[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant] branch master updated (3fd4f33 -> 1ae3bdf)
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-merchant] branch master updated (3fd4f33 -> 1ae3bdf) |
Date: |
Fri, 02 Feb 2018 23:24:10 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a change to branch master
in repository merchant.
discard 3fd4f33 avoid uninitialized value
This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.
* -- * -- N refs/heads/master (1ae3bdf)
\
O -- O -- O (3fd4f33)
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.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, 29 insertions(+), 23 deletions(-)
create mode 100644 doc/arch.dot
diff --git a/.gitignore b/.gitignore
index ec1147a..f2f8d1f 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 ba34694..a755143 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -8,36 +8,20 @@ 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 \
- 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
+info_TEXINFOS = manual.texi
-merchant_api_curl_TEXINFOS = \
- version-merchant-api-curl.texi \
- merchant-api.content.texi
+manual_TEXINFOS = version.texi
extra_TEXINFOS = \
fdl-1.3.texi \
agpl.texi \
- syntax.texi \
- merchant-api.content.texi
+ syntax.texi
EXTRA_DIST = \
arch.dot \
diff --git a/doc/arch.dot b/doc/arch.dot
new file mode 100644
index 0000000..acc9ed8
--- /dev/null
+++ b/doc/arch.dot
@@ -0,0 +1,23 @@
+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 677f7de..d8eeb0e 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-manual.texi
address@hidden version.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 1dffaf5..64bd5e9 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 = NULL;
+ char *last_session_id;
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 c8ae9f8..5a92e9c 100644
--- a/src/lib/test_merchant_api.c
+++ b/src/lib/test_merchant_api.c
@@ -1595,7 +1595,6 @@ 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-merchant] branch master updated (3fd4f33 -> 1ae3bdf),
gnunet <=