1 files changed, 44 insertions, 44 deletions
diff --git a/src/pq/pq_exec.c b/src/pq/pq_exec.c
index 99eb2b270..6c8002aff 100644
--- a/src/pq/pq_exec.c
+++ b/src/pq/pq_exec.c
@@ -1,22 +1,22 @@
 /*
-  This file is part of GNUnet
+   This file is part of GNUnet
-  Copyright (C) 2017 GNUnet e.V.
+   Copyright (C) 2017 GNUnet e.V.
-  GNUnet is free software: you can redistribute it and/or modify it
+   GNUnet is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Affero General Public License as published
+   under the terms of the GNU Affero General Public License as published
-  by the Free Software Foundation, either version 3 of the License,
+   by the Free Software Foundation, either version 3 of the License,
-  or (at your option) any later version.
+   or (at your option) any later version.
-  GNUnet is distributed in the hope that it will be useful, but
+   GNUnet is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
+   WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Affero General Public License for more details.
+   Affero General Public License for more details.
-  You should have received a copy of the GNU Affero General Public License
+   You should have received a copy of the GNU Affero General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
     SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
 * @file pq/pq_exec.c
 * @brief functions to execute plain SQL statements (PostGres)
@@ -34,7 +34,7 @@
 * @return initialized struct
 */
 struct GNUNET_PQ_ExecuteStatement
-GNUNET_PQ_make_execute (const char *sql)
+GNUNET_PQ_make_execute(const char *sql)
 {
  struct GNUNET_PQ_ExecuteStatement es = {
    .sql = sql,
@@ -53,7 +53,7 @@ GNUNET_PQ_make_execute (const char *sql)
 * @return initialized struct
 */
 struct GNUNET_PQ_ExecuteStatement
-GNUNET_PQ_make_try_execute (const char *sql)
+GNUNET_PQ_make_try_execute(const char *sql)
 {
  struct GNUNET_PQ_ExecuteStatement es = {
    .sql = sql,
@@ -74,38 +74,38 @@ GNUNET_PQ_make_try_execute (const char *sql)
 *         #GNUNET_SYSERR on error
 */
 int
-GNUNET_PQ_exec_statements (PGconn *connection,
+GNUNET_PQ_exec_statements(PGconn *connection,
-                           const struct GNUNET_PQ_ExecuteStatement *es)
+                          const struct GNUNET_PQ_ExecuteStatement *es)
 {
-  for (unsigned int i=0; NULL != es[i].sql; i++)
+  for (unsigned int i = 0; NULL != es[i].sql; i++)
-  {
-    PGresult *result;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Running statement `%s' on %p\n",
-                es[i].sql,
-                connection);
-    result = PQexec (connection,
-                     es[i].sql);
-    if ( (GNUNET_NO == es[i].ignore_errors) &&
-         (PGRES_COMMAND_OK != PQresultStatus (result)) )
    {
-      GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+      PGresult *result;
-                       "pq",
-                       "Failed to execute `%s': %s/%s/%s/%s/%s",
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-                       es[i].sql,
+                 "Running statement `%s' on %p\n",
-                       PQresultErrorField (result,
+                 es[i].sql,
-                                           PG_DIAG_MESSAGE_PRIMARY),
+                 connection);
-                       PQresultErrorField (result,
+      result = PQexec(connection,
-                                           PG_DIAG_MESSAGE_DETAIL),
+                      es[i].sql);
-                       PQresultErrorMessage (result),
+      if ((GNUNET_NO == es[i].ignore_errors) &&
-                       PQresStatus (PQresultStatus (result)),
+          (PGRES_COMMAND_OK != PQresultStatus(result)))
-                       PQerrorMessage (connection));
+        {
-      PQclear (result);
+          GNUNET_log_from(GNUNET_ERROR_TYPE_ERROR,
-      return GNUNET_SYSERR;
+                          "pq",
+                          "Failed to execute `%s': %s/%s/%s/%s/%s",
+                          es[i].sql,
+                          PQresultErrorField(result,
+                                             PG_DIAG_MESSAGE_PRIMARY),
+                          PQresultErrorField(result,
+                                             PG_DIAG_MESSAGE_DETAIL),
+                          PQresultErrorMessage(result),
+                          PQresStatus(PQresultStatus(result)),
+                          PQerrorMessage(connection));
+          PQclear(result);
+          return GNUNET_SYSERR;
+        }
+      PQclear(result);
    }
-    PQclear (result);
-  }
  return GNUNET_OK;
 }

diff --git a/src/pq/pq_exec.c b/src/pq/pq_exec.c index 99eb2b270..6c8002aff 100644 --- a/src/pq/pq_exec.c +++ b/src/pq/pq_exec.c
@@ -1,22 +1,22 @@
1	/*	1	/*
2	This file is part of GNUnet	2	This file is part of GNUnet
3	Copyright (C) 2017 GNUnet e.V.	3	Copyright (C) 2017 GNUnet e.V.
4		4
5	GNUnet is free software: you can redistribute it and/or modify it	5	GNUnet is free software: you can redistribute it and/or modify it
6	under the terms of the GNU Affero General Public License as published	6	under the terms of the GNU Affero General Public License as published
7	by the Free Software Foundation, either version 3 of the License,	7	by the Free Software Foundation, either version 3 of the License,
8	or (at your option) any later version.	8	or (at your option) any later version.
9		9
10	GNUnet is distributed in the hope that it will be useful, but	10	GNUnet is distributed in the hope that it will be useful, but
11	WITHOUT ANY WARRANTY; without even the implied warranty of	11	WITHOUT ANY WARRANTY; without even the implied warranty of
12	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	12	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13	Affero General Public License for more details.	13	Affero General Public License for more details.
14		14
15	You should have received a copy of the GNU Affero General Public License	15	You should have received a copy of the GNU Affero General Public License
16	along with this program. If not, see <http://www.gnu.org/licenses/>.	16	along with this program. If not, see <http://www.gnu.org/licenses/>.
17		17
18	SPDX-License-Identifier: AGPL3.0-or-later	18	SPDX-License-Identifier: AGPL3.0-or-later
19	*/	19	*/
20	/**	20	/**
21	* @file pq/pq_exec.c	21	* @file pq/pq_exec.c
22	* @brief functions to execute plain SQL statements (PostGres)	22	* @brief functions to execute plain SQL statements (PostGres)
@@ -34,7 +34,7 @@
34	* @return initialized struct	34	* @return initialized struct
35	*/	35	*/
36	struct GNUNET_PQ_ExecuteStatement	36	struct GNUNET_PQ_ExecuteStatement
37	GNUNET_PQ_make_execute (const char *sql)	37	GNUNET_PQ_make_execute(const char *sql)
38	{	38	{
39	struct GNUNET_PQ_ExecuteStatement es = {	39	struct GNUNET_PQ_ExecuteStatement es = {
40	.sql = sql,	40	.sql = sql,
@@ -53,7 +53,7 @@ GNUNET_PQ_make_execute (const char *sql)
53	* @return initialized struct	53	* @return initialized struct
54	*/	54	*/
55	struct GNUNET_PQ_ExecuteStatement	55	struct GNUNET_PQ_ExecuteStatement
56	GNUNET_PQ_make_try_execute (const char *sql)	56	GNUNET_PQ_make_try_execute(const char *sql)
57	{	57	{
58	struct GNUNET_PQ_ExecuteStatement es = {	58	struct GNUNET_PQ_ExecuteStatement es = {
59	.sql = sql,	59	.sql = sql,
@@ -74,38 +74,38 @@ GNUNET_PQ_make_try_execute (const char *sql)
74	* #GNUNET_SYSERR on error	74	* #GNUNET_SYSERR on error
75	*/	75	*/
76	int	76	int
77	GNUNET_PQ_exec_statements (PGconn *connection,	77	GNUNET_PQ_exec_statements(PGconn *connection,
78	const struct GNUNET_PQ_ExecuteStatement *es)	78	const struct GNUNET_PQ_ExecuteStatement *es)
79	{	79	{
80	for (unsigned int i=0; NULL != es[i].sql; i++)	80	for (unsigned int i = 0; NULL != es[i].sql; i++)
81	{
82	PGresult *result;
83
84	GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
85	"Running statement `%s' on %p\n",
86	es[i].sql,
87	connection);
88	result = PQexec (connection,
89	es[i].sql);
90	if ( (GNUNET_NO == es[i].ignore_errors) &&
91	(PGRES_COMMAND_OK != PQresultStatus (result)) )
92	{	81	{
93	GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,	82	PGresult *result;
94	"pq",	83
95	"Failed to execute `%s': %s/%s/%s/%s/%s",	84	GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
96	es[i].sql,	85	"Running statement `%s' on %p\n",
97	PQresultErrorField (result,	86	es[i].sql,
98	PG_DIAG_MESSAGE_PRIMARY),	87	connection);
99	PQresultErrorField (result,	88	result = PQexec(connection,
100	PG_DIAG_MESSAGE_DETAIL),	89	es[i].sql);
101	PQresultErrorMessage (result),	90	if ((GNUNET_NO == es[i].ignore_errors) &&
102	PQresStatus (PQresultStatus (result)),	91	(PGRES_COMMAND_OK != PQresultStatus(result)))
103	PQerrorMessage (connection));	92	{
104	PQclear (result);	93	GNUNET_log_from(GNUNET_ERROR_TYPE_ERROR,
105	return GNUNET_SYSERR;	94	"pq",
		95	"Failed to execute `%s': %s/%s/%s/%s/%s",
		96	es[i].sql,
		97	PQresultErrorField(result,
		98	PG_DIAG_MESSAGE_PRIMARY),
		99	PQresultErrorField(result,
		100	PG_DIAG_MESSAGE_DETAIL),
		101	PQresultErrorMessage(result),
		102	PQresStatus(PQresultStatus(result)),
		103	PQerrorMessage(connection));
		104	PQclear(result);
		105	return GNUNET_SYSERR;
		106	}
		107	PQclear(result);
106	}	108	}
107	PQclear (result);
108	}
109	return GNUNET_OK;	109	return GNUNET_OK;
110	}	110	}
111		111