Merge branch 'master' of ssh://gnunet.org/gnunet

[oweals/gnunet.git] / src / include / gnunet_pq_lib.h

diff --git a/src/include/gnunet_pq_lib.h b/src/include/gnunet_pq_lib.h
index fdb959aecfae345e80839cb500cf15a4ab8a52ac..756370b7401297aa9e6ea57ae91c464364c26d96 100644 (file)
--- a/src/include/gnunet_pq_lib.h
+++ b/src/include/gnunet_pq_lib.h
@@ -15,11 +15,11 @@
 */
 /**
  * @file include/gnunet_pq_lib.h
- * @brief helper functions for DB interactions
+ * @brief helper functions for Postgres DB interactions
  * @author Christian Grothoff
  */
-#ifndef GNUNET_PQ_LIB_H_
-#define GNUNET_PQ_LIB_H_
+#ifndef GNUNET_PQ_LIB_H
+#define GNUNET_PQ_LIB_H
 
 #include <libpq-fe.h>
 #include "gnunet_util_lib.h"
@@ -317,17 +317,15 @@ GNUNET_PQ_result_spec_fixed_size (const char *name,
 
 
 /**
- * Variable-size result expected.
+ * 0-terminated string expected.
  *
  * @param name name of the field in the table
  * @param[out] dst where to store the result, allocated
- * @param[out] sptr where to store the size of @a dst
  * @return array entry for the result specification to use
  */
 struct GNUNET_PQ_ResultSpec
-GNUNET_PQ_result_spec_variable_size (const char *name,
-                                    void **dst,
-                                    size_t *sptr);
+GNUNET_PQ_result_spec_string (const char *name,
+                              char **dst);
 
 
 /**
@@ -430,15 +428,12 @@ GNUNET_PQ_exec_prepared (PGconn *db_conn,
 
 /**
  * Extract results from a query result according to the given specification.
- * If colums are NULL, the destination is not modified, and #GNUNET_NO
- * is returned.
  *
  * @param result result to process
  * @param[in,out] rs result specification to extract for
  * @param row row from the result to extract
  * @return
  *   #GNUNET_YES if all results could be extracted
- *   #GNUNET_NO if at least one result was NULL
  *   #GNUNET_SYSERR if a result was invalid (non-existing field)
  */
 int