-fix format warning

[oweals/gnunet.git] / src / postgres / postgres.c

diff --git a/src/postgres/postgres.c b/src/postgres/postgres.c
index c6b9a5aa62ce6f31a82cb63352ba69efe284f261..856031d7590f3474f960ea1cc1124d2a84bb43e4 100644 (file)
--- a/src/postgres/postgres.c
+++ b/src/postgres/postgres.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet
-     (C) 2009, 2010, 2012 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009, 2010, 2012 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file postgres/postgres.c
@@ -35,15 +35,19 @@
  * @param ret return value from database operation to check
  * @param expected_status desired status
  * @param command description of the command that was run
- * @param args arguments given to the command 
+ * @param args arguments given to the command
  * @param filename name of the source file where the command was run
  * @param line line number in the source file
- * @return GNUNET_OK if the result is acceptable
+ * @return #GNUNET_OK if the result is acceptable
  */
 int
-GNUNET_POSTGRES_check_result_ (PGconn *dbh, PGresult * ret, int expected_status,
-                             const char *command, const char *args, const char *filename,
-                             int line)
+GNUNET_POSTGRES_check_result_ (PGconn *dbh,
+                              PGresult *ret,
+                               int expected_status, 
+                              const char *command,
+                               const char *args, 
+                              const char *filename, 
+                              int line)
 {
   if (ret == NULL)
   {
@@ -56,9 +60,8 @@ GNUNET_POSTGRES_check_result_ (PGconn *dbh, PGresult * ret, int expected_status,
   if (PQresultStatus (ret) != expected_status)
   {
     GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                     "postgres",
-                     _("`%s:%s' failed at %s:%d with error: %s"), command, args,
-                     filename, line, PQerrorMessage (dbh));
+                     "postgres", _("`%s:%s' failed at %s:%d with error: %s"),
+                     command, args, filename, line, PQerrorMessage (dbh));
     PQclear (ret);
     return GNUNET_SYSERR;
   }
@@ -72,19 +75,21 @@ GNUNET_POSTGRES_check_result_ (PGconn *dbh, PGresult * ret, int expected_status,
  * @param dbh database handle
  * @param sql statement to run
  * @param filename filename for error reporting
- * @param line code line for error reporting 
- * @return GNUNET_OK on success
+ * @param line code line for error reporting
+ * @return #GNUNET_OK on success
  */
 int
-GNUNET_POSTGRES_exec_ (PGconn *dbh, const char *sql,
-                     const char *filename,
-                     int line)
+GNUNET_POSTGRES_exec_ (PGconn * dbh, 
+                      const char *sql, 
+                      const char *filename,
+                       int line)
 {
   PGresult *ret;
 
   ret = PQexec (dbh, sql);
   if (GNUNET_OK !=
-      GNUNET_POSTGRES_check_result_ (dbh, ret, PGRES_COMMAND_OK, "PQexec", sql, filename, line))
+      GNUNET_POSTGRES_check_result_ (dbh, ret, PGRES_COMMAND_OK, "PQexec", sql,
+                                     filename, line))
     return GNUNET_SYSERR;
   PQclear (ret);
   return GNUNET_OK;
@@ -100,17 +105,30 @@ GNUNET_POSTGRES_exec_ (PGconn *dbh, const char *sql,
  * @param nparams number of parameters in sql
  * @param filename filename for error reporting
  * @param line code line for error reporting
- * @return GNUNET_OK on success
+ * @return #GNUNET_OK on success
  */
 int
-GNUNET_POSTGRES_prepare_ (PGconn *dbh, const char *name, const char *sql,
-                        int nparms, const char *filename, int line)
+GNUNET_POSTGRES_prepare_ (PGconn *dbh,
+                         const char *name, 
+                         const char *sql,
+                          int nparams, 
+                         const char *filename, 
+                         int line)
 {
   PGresult *ret;
 
-  ret = PQprepare (dbh, name, sql, nparms, NULL);
+  ret = PQprepare (dbh,
+                  name, 
+                  sql, 
+                  nparams, NULL);
   if (GNUNET_OK !=
-      GNUNET_POSTGRES_check_result_ (dbh, ret, PGRES_COMMAND_OK, "PQprepare", sql, filename, line))
+      GNUNET_POSTGRES_check_result_ (dbh, 
+                                    ret, 
+                                    PGRES_COMMAND_OK,
+                                    "PQprepare",
+                                     sql, 
+                                    filename, 
+                                    line))
     return GNUNET_SYSERR;
   PQclear (ret);
   return GNUNET_OK;
@@ -125,17 +143,15 @@ GNUNET_POSTGRES_prepare_ (PGconn *dbh, const char *name, const char *sql,
  * @return the postgres handle
  */
 PGconn *
-GNUNET_POSTGRES_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                        const char *section)
+GNUNET_POSTGRES_connect (const struct GNUNET_CONFIGURATION_Handle * cfg,
+                         const char *section)
 {
   PGconn *dbh;
   char *conninfo;
 
   /* Open database and precompile statements */
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             section, "CONFIG",
-                                             &conninfo))
+      GNUNET_CONFIGURATION_get_value_string (cfg, section, "CONFIG", &conninfo))
     conninfo = NULL;
   dbh = PQconnectdb (conninfo == NULL ? "" : conninfo);
   GNUNET_free_non_null (conninfo);
@@ -160,13 +176,13 @@ GNUNET_POSTGRES_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * Delete the row identified by the given rowid (qid
  * in postgres).
  *
- * @param database handle
+ * @param dbh database handle
  * @param stmt name of the prepared statement
  * @param rowid which row to delete
- * @return GNUNET_OK on success
+ * @return #GNUNET_OK on success
  */
 int
-GNUNET_POSTGRES_delete_by_rowid (PGconn *dbh,
+GNUNET_POSTGRES_delete_by_rowid (PGconn * dbh, 
                                 const char *stmt,
                                 uint32_t rowid)
 {
@@ -177,12 +193,18 @@ GNUNET_POSTGRES_delete_by_rowid (PGconn *dbh,
   PGresult *ret;
 
   ret =
-    PQexecPrepared (dbh, stmt, 1, paramValues, paramLengths,
-                      paramFormats, 1);
+      PQexecPrepared (dbh, stmt, 1, 
+                     paramValues, 
+                     paramLengths, 
+                     paramFormats, 
+                     1);
   if (GNUNET_OK !=
-      GNUNET_POSTGRES_check_result_ (dbh, ret, PGRES_COMMAND_OK, "PQexecPrepared", "delrow",
-                                   __FILE__,
-                                   __LINE__))
+      GNUNET_POSTGRES_check_result_ (dbh, ret, 
+                                    PGRES_COMMAND_OK,
+                                     "PQexecPrepared", 
+                                    "delrow",
+                                    __FILE__,
+                                     __LINE__))
   {
     return GNUNET_SYSERR;
   }