[GNUnet-SVN] r37360 - in gnunet/src: include my

[gnunet]

Author: grothoff
Date: 2016-06-24 22:23:03 +0200 (Fri, 24 Jun 2016)
New Revision: 37360

Modified:
   gnunet/src/include/gnunet_my_lib.h
   gnunet/src/my/my_query_helper.c
   gnunet/src/my/my_result_helper.c
Log:
-housekeeping

Modified: gnunet/src/include/gnunet_my_lib.h
===================================================================
--- gnunet/src/include/gnunet_my_lib.h  2016-06-24 20:17:39 UTC (rev 37359)
+++ gnunet/src/include/gnunet_my_lib.h  2016-06-24 20:23:03 UTC (rev 37360)
@@ -259,7 +259,7 @@
  *
  * @return array last entry for the result specification to use
  */
-#define GNUNET_MY_result_spec_end { NULL, NULL, NULL, 0, NULL, 0 }
+#define GNUNET_MY_result_spec_end { NULL, NULL, NULL, 0, NULL, 0, 0 }
 
 
 

Modified: gnunet/src/my/my_query_helper.c
===================================================================
--- gnunet/src/my/my_query_helper.c     2016-06-24 20:17:39 UTC (rev 37359)
+++ gnunet/src/my/my_query_helper.c     2016-06-24 20:23:03 UTC (rev 37360)
@@ -57,7 +57,6 @@
                     MYSQL_BIND *qbind)
 {
   GNUNET_assert (1 == qp->num_params);
-
   qbind->buffer = (void *) qp->data;
   qbind->buffer_length = qp->data_len;
   qbind->buffer_type = MYSQL_TYPE_BLOB;
@@ -90,29 +89,29 @@
 
 
 /**
-  * Generate query parameter for a string
-  *
-  address@hidden ptr pointer to the string query parameter to pass
-  */
+ * Generate query parameter for a string
+ *
+ * @param ptr pointer to the string query parameter to pass
+ */
 struct GNUNET_MY_QueryParam
 GNUNET_MY_query_param_string (const char *ptr)
 {
-  return GNUNET_MY_query_param_fixed_size(ptr,
-                                         strlen(ptr));
+  return GNUNET_MY_query_param_fixed_size (ptr,
+                                           strlen(ptr));
 }
 
 
 /**
-  * Function called to convert input argument into SQL parameters
-  *
-  address@hidden cls closure
-  address@hidden pq data about the query
+ * Function called to convert input argument into SQL parameters
+ *
+ * @param cls closure
+ * @param pq data about the query
  * @param qbind array of parameters to initialize
-  address@hidden -1 on error
-  */
+ * @return -1 on error
+ */
 static int
 my_conv_uint16 (void *cls,
-                const struct GNUNET_MY_QueryParam * qp,
+                const struct GNUNET_MY_QueryParam *qp,
                 MYSQL_BIND *qbind)
 {
   GNUNET_assert (1 == qp->num_params);
@@ -124,10 +123,10 @@
 
 
 /**
-  * Generate query parameter for an uint16_t in host byte order.
-  *
-  * @param x pointer to the query parameter to pass
-  */
+ * Generate query parameter for an uint16_t in host byte order.
+ *
+ * @param x pointer to the query parameter to pass
+ */
 struct GNUNET_MY_QueryParam
 GNUNET_MY_query_param_uint16 (const uint16_t *x)
 {
@@ -145,13 +144,13 @@
 
 
 /**
-  * Function called to convert input argument into SQL parameters
-  *
-  address@hidden cls closure
-  address@hidden pq data about the query
+ * Function called to convert input argument into SQL parameters
+ *
+ * @param cls closure
+ * @param pq data about the query
  * @param qbind array of parameters to initialize
-  address@hidden -1 on error
-  */
+ * @return -1 on error
+ */
 static int
 my_conv_uint32 (void *cls,
                 const struct GNUNET_MY_QueryParam *qp,
@@ -167,10 +166,10 @@
 
 
 /**
-  * Generate query parameter for an uint32_t in host byte order
-  *
-  address@hidden x pointer to the query parameter to pass
-  */
+ * Generate query parameter for an uint32_t in host byte order
+ *
+ * @param x pointer to the query parameter to pass
+ */
 struct GNUNET_MY_QueryParam
 GNUNET_MY_query_param_uint32 (const uint32_t *x)
 {
@@ -188,13 +187,13 @@
 
 
 /**
-  * Function called to convert input argument into SQL parameters
-  *
-  address@hidden cls closure
-  address@hidden pq data about the query
+ * Function called to convert input argument into SQL parameters
+ *
+ * @param cls closure
+ * @param pq data about the query
  * @param qbind array of parameters to initialize
-  address@hidden -1 on error
-  */
+ * @return -1 on error
+ */
 static int
 my_conv_uint64 (void *cls,
                 const struct GNUNET_MY_QueryParam *qp,
@@ -209,10 +208,10 @@
 
 
 /**
-  * Generate query parameter for an uint64_t in host byte order
-  *
-  address@hidden x pointer to the query parameter to pass
-  */
+ * Generate query parameter for an uint64_t in host byte order
+ *
+ * @param x pointer to the query parameter to pass
+ */
 struct GNUNET_MY_QueryParam
 GNUNET_MY_query_param_uint64 (const uint64_t *x)
 {
@@ -230,13 +229,13 @@
 
 
 /**
-  * Function called to convert input argument into SQL parameters
-  *
-  address@hidden cls closure
-  address@hidden pq data about the query
+ * Function called to convert input argument into SQL parameters
+ *
+ * @param cls closure
+ * @param pq data about the query
  * @param qbind array of parameters to initialize
-  address@hidden -1 on error
-  */
+ * @return -1 on error
+ */
 static int
 my_conv_rsa_public_key (void *cls,
                         const struct GNUNET_MY_QueryParam *qp,
@@ -259,12 +258,12 @@
 
 
 /**
-  * Generate query parameter for an RSA public key. The
-  * database must contain a BLOB type in the respective position.
-  *
-  * @param x the query parameter to pass
-  * @return array entry for the query parameters to use
-  */
+ * Generate query parameter for an RSA public key. The
+ * database must contain a BLOB type in the respective position.
+ *
+ * @param x the query parameter to pass
+ * @return array entry for the query parameters to use
+ */
 struct GNUNET_MY_QueryParam
 GNUNET_MY_query_param_rsa_public_key (const struct GNUNET_CRYPTO_RsaPublicKey 
*x)
 {
@@ -311,12 +310,12 @@
 
 
 /**
-  * Generate query parameter for an RSA signature. The
-  * database must contain a BLOB type in the respective position
-  *
-  address@hidden x the query parameter to pass
-  address@hidden array entry for the query parameters to use
-  */
+ * Generate query parameter for an RSA signature. The
+ * database must contain a BLOB type in the respective position
+ *
+ * @param x the query parameter to pass
+ * @return array entry for the query parameters to use
+ */
 struct GNUNET_MY_QueryParam
 GNUNET_MY_query_param_rsa_signature (const struct GNUNET_CRYPTO_RsaSignature 
*x)
 {
@@ -333,12 +332,12 @@
 
 
 /**
-  * Generate query parameter for an absolute time value.
-  * The database must store a 64-bit integer.
-  *
-  address@hidden x pointer to the query parameter to pass
-  address@hidden array entry for the query parameters to use
-  */
+ * Generate query parameter for an absolute time value.
+ * The database must store a 64-bit integer.
+ *
+ * @param x pointer to the query parameter to pass
+ * @return array entry for the query parameters to use
+ */
 struct GNUNET_MY_QueryParam
 GNUNET_MY_query_param_absolute_time (const struct GNUNET_TIME_Absolute *x)
 {
@@ -347,11 +346,11 @@
 
 
 /**
-  * Generate query parameter for an absolute time value.
-  * The database must store a 64-bit integer.
-  *
-  address@hidden x pointer to the query parameter to pass
-  */
+ * Generate query parameter for an absolute time value.
+ * The database must store a 64-bit integer.
+ *
+ * @param x pointer to the query parameter to pass
+ */
 struct GNUNET_MY_QueryParam
 GNUNET_MY_query_param_absolute_time_nbo (const struct GNUNET_TIME_AbsoluteNBO 
*x)
 {

Modified: gnunet/src/my/my_result_helper.c
===================================================================
--- gnunet/src/my/my_result_helper.c    2016-06-24 20:17:39 UTC (rev 37359)
+++ gnunet/src/my/my_result_helper.c    2016-06-24 20:23:03 UTC (rev 37360)
@@ -865,4 +865,4 @@
 }
 
 
-/* end of pq_result_helper.c */
+/* end of my_result_helper.c */