From dfa69cf100b43ff62896a507e3f2d5092f653bff Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Mon, 7 Mar 2016 10:53:43 +0100 Subject: still on licensing --- src/Makefile.am | 1 + src/backend/taler-merchant-httpd.c | 5 +++-- src/backend/taler-merchant-httpd.h | 2 +- src/backend/taler-merchant-httpd_auditors.c | 2 +- src/backend/taler-merchant-httpd_auditors.h | 2 +- src/backend/taler-merchant-httpd_contract.c | 2 +- src/backend/taler-merchant-httpd_contract.h | 2 +- src/backend/taler-merchant-httpd_exchanges.c | 2 +- src/backend/taler-merchant-httpd_exchanges.h | 2 +- src/backend/taler-merchant-httpd_mhd.c | 2 +- src/backend/taler-merchant-httpd_mhd.h | 2 +- src/backend/taler-merchant-httpd_pay.c | 2 +- src/backend/taler-merchant-httpd_util.c | 2 +- src/backenddb/merchantdb_plugin.c | 2 +- src/backenddb/plugin_merchantdb_postgres.c | 2 +- src/include/platform.h | 2 +- src/include/taler_merchant_service.h | 2 +- src/include/taler_merchantdb_lib.h | 2 +- src/include/taler_merchantdb_plugin.h | 2 +- src/tests/test_contract.c | 2 +- 20 files changed, 22 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 4d26b2c8..55f6a82b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,2 +1,3 @@ +# This Makefile is in the public domain AM_CPPFLAGS = -I$(top_srcdir)/src/include SUBDIRS = include backenddb backend diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index 14ac2ad9..1f8d7e54 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -1,6 +1,6 @@ /* This file is part of TALER - (C) 2014, 2015 GNUnet e.V. + (C) 2014, 2015 INRIA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -350,7 +350,6 @@ parse_wireformat_test (const struct GNUNET_CONFIGURATION_Handle *cfg) if (NULL == j_wire) return GNUNET_SYSERR; return GNUNET_OK; - } @@ -545,6 +544,7 @@ run (void *cls, { char *wireformat; + wireformat = NULL; result = GNUNET_SYSERR; shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, @@ -627,6 +627,7 @@ run (void *cls, EXITIF_exit: if (GNUNET_OK != result) GNUNET_SCHEDULER_shutdown (); + GNUNET_free_non_null (wireformat); GNUNET_free_non_null (keyfile); if (GNUNET_OK != result) GNUNET_SCHEDULER_shutdown (); diff --git a/src/backend/taler-merchant-httpd.h b/src/backend/taler-merchant-httpd.h index f64bb099..6804f842 100644 --- a/src/backend/taler-merchant-httpd.h +++ b/src/backend/taler-merchant-httpd.h @@ -1,6 +1,6 @@ /* This file is part of TALER - (C) 2014, 2015 GNUnet e.V. + Copyright (C) 2014, 2015 GNUnet e.V. and INRIA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/src/backend/taler-merchant-httpd_auditors.c b/src/backend/taler-merchant-httpd_auditors.c index e479f8b6..ca993928 100644 --- a/src/backend/taler-merchant-httpd_auditors.c +++ b/src/backend/taler-merchant-httpd_auditors.c @@ -1,6 +1,6 @@ /* This file is part of TALER - (C) 2014, 2015 GNUnet e.V. + (C) 2014, 2015 GNUnet e.V. and INRIA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/src/backend/taler-merchant-httpd_auditors.h b/src/backend/taler-merchant-httpd_auditors.h index e71b4964..57e0ff51 100644 --- a/src/backend/taler-merchant-httpd_auditors.h +++ b/src/backend/taler-merchant-httpd_auditors.h @@ -1,6 +1,6 @@ /* This file is part of TALER - (C) 2014, 2015 GNUnet e.V. + (C) 2014, 2015 GNUnet e.V. and INRIA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/src/backend/taler-merchant-httpd_contract.c b/src/backend/taler-merchant-httpd_contract.c index 28431df7..a2b893b9 100644 --- a/src/backend/taler-merchant-httpd_contract.c +++ b/src/backend/taler-merchant-httpd_contract.c @@ -1,6 +1,6 @@ /* This file is part of TALER - (C) 2014, 2015 GNUnet e.V. + (C) 2014, 2015 GNUnet e.V. and INRIA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/src/backend/taler-merchant-httpd_contract.h b/src/backend/taler-merchant-httpd_contract.h index 88c12805..92f0aa99 100644 --- a/src/backend/taler-merchant-httpd_contract.h +++ b/src/backend/taler-merchant-httpd_contract.h @@ -1,6 +1,6 @@ /* This file is part of TALER - (C) 2014, 2015 GNUnet e.V. + (C) 2014, 2015 GNUnet e.V. and INRIA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/src/backend/taler-merchant-httpd_exchanges.c b/src/backend/taler-merchant-httpd_exchanges.c index 59e97495..2ca95aee 100644 --- a/src/backend/taler-merchant-httpd_exchanges.c +++ b/src/backend/taler-merchant-httpd_exchanges.c @@ -1,6 +1,6 @@ /* This file is part of TALER - (C) 2014, 2015 GNUnet e.V. + (C) 2014, 2015 GNUnet e.V. and INRIA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/src/backend/taler-merchant-httpd_exchanges.h b/src/backend/taler-merchant-httpd_exchanges.h index 6612f4f4..868ff0cf 100644 --- a/src/backend/taler-merchant-httpd_exchanges.h +++ b/src/backend/taler-merchant-httpd_exchanges.h @@ -1,6 +1,6 @@ /* This file is part of TALER - (C) 2014, 2015 GNUnet e.V. + (C) 2014, 2015 GNUnet e.V. and INRIA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/src/backend/taler-merchant-httpd_mhd.c b/src/backend/taler-merchant-httpd_mhd.c index 9ffabe4d..eddb447f 100644 --- a/src/backend/taler-merchant-httpd_mhd.c +++ b/src/backend/taler-merchant-httpd_mhd.c @@ -1,6 +1,6 @@ /* This file is part of TALER - Copyright (C) 2014, 2015 GNUnet e.V. + Copyright (C) 2014, 2015 GNUnet e.V. and INRIA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software diff --git a/src/backend/taler-merchant-httpd_mhd.h b/src/backend/taler-merchant-httpd_mhd.h index 48d210a1..fdfb81db 100644 --- a/src/backend/taler-merchant-httpd_mhd.h +++ b/src/backend/taler-merchant-httpd_mhd.h @@ -1,6 +1,6 @@ /* This file is part of TALER - Copyright (C) 2014 GNUnet e.V. + Copyright (C) 2014, 2015 GNUnet e.V. and INRIA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software diff --git a/src/backend/taler-merchant-httpd_pay.c b/src/backend/taler-merchant-httpd_pay.c index 4c12ea6c..cc467837 100644 --- a/src/backend/taler-merchant-httpd_pay.c +++ b/src/backend/taler-merchant-httpd_pay.c @@ -1,6 +1,6 @@ /* This file is part of TALER - (C) 2014, 2015, 2016 GNUnet e.V. + (C) 2014, 2015, 2016 GNUnet e.V. and INRIA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/src/backend/taler-merchant-httpd_util.c b/src/backend/taler-merchant-httpd_util.c index 4fa6ab82..0a8237f3 100644 --- a/src/backend/taler-merchant-httpd_util.c +++ b/src/backend/taler-merchant-httpd_util.c @@ -1,6 +1,6 @@ /* This file is part of TALER - (C) 2014, 2015 GNUnet e.V. + (C) 2014, 2015 GNUnet e.V. and INRIA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/src/backenddb/merchantdb_plugin.c b/src/backenddb/merchantdb_plugin.c index 52d0dd1f..16758fd1 100644 --- a/src/backenddb/merchantdb_plugin.c +++ b/src/backenddb/merchantdb_plugin.c @@ -1,6 +1,6 @@ /* This file is part of TALER - Copyright (C) 2015 GNUnet e.V. + Copyright (C) 2015 GNUnet e.V. and INRIA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c index c9e504fa..74be6a9c 100644 --- a/src/backenddb/plugin_merchantdb_postgres.c +++ b/src/backenddb/plugin_merchantdb_postgres.c @@ -1,6 +1,6 @@ /* This file is part of TALER - (C) 2014, 2015 GNUnet e.V. + (C) 2014, 2015 GNUnet e.V. and INRIA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/src/include/platform.h b/src/include/platform.h index 6e4baec6..f62299b5 100644 --- a/src/include/platform.h +++ b/src/include/platform.h @@ -1,6 +1,6 @@ /* This file is part of TALER - (C) 2014 Chrisitan Grothoff (and other contributing authors) + Copyright (C) 2014, 2015 GNUnet e.V. and INRIA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h index e3b26ee8..22760dd5 100644 --- a/src/include/taler_merchant_service.h +++ b/src/include/taler_merchant_service.h @@ -1,6 +1,6 @@ /* This file is part of TALER - Copyright (C) 2014, 2015, 2016 GNUnet e.V. + Copyright (C) 2014, 2015 GNUnet e.V. and INRIA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software diff --git a/src/include/taler_merchantdb_lib.h b/src/include/taler_merchantdb_lib.h index 93cb4656..bb5bb9d3 100644 --- a/src/include/taler_merchantdb_lib.h +++ b/src/include/taler_merchantdb_lib.h @@ -1,6 +1,6 @@ /* This file is part of TALER - (C) 2014, 2015 GNUnet e.V. + Copyright (C) 2014, 2015 GNUnet e.V. and INRIA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h index 959b2a2c..693417b4 100644 --- a/src/include/taler_merchantdb_plugin.h +++ b/src/include/taler_merchantdb_plugin.h @@ -1,6 +1,6 @@ /* This file is part of TALER - Copyright (C) 2014, 2015 GNUnet e.V. + Copyright (C) 2014, 2015 GNUnet e.V. and INRIA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/src/tests/test_contract.c b/src/tests/test_contract.c index f48ed613..17b6106a 100644 --- a/src/tests/test_contract.c +++ b/src/tests/test_contract.c @@ -1,6 +1,6 @@ /* This file is part of TALER - (C) 2014 GNUnet e.V. + Copyright (C) 2014, 2015 GNUnet e.V. and INRIA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software -- cgit v1.2.3