avoid disconnect on cancel

[oweals/gnunet.git] / src / datastore / plugin_datastore_mysql.c

diff --git a/src/datastore/plugin_datastore_mysql.c b/src/datastore/plugin_datastore_mysql.c
index 51a60a1dc36c77636c05bba845a5e31d7e331259..150dc665c2c8e41064b3c21f7500f3d2a984f5ef 100644 (file)
--- a/src/datastore/plugin_datastore_mysql.c
+++ b/src/datastore/plugin_datastore_mysql.c
@@ -49,13 +49,13 @@
  *
  * 1) in /etc/gnunet.conf, set
  * @verbatim
- *     [datastore]
- *     DATABASE = "mysql"
- * @endverbatim
+       [datastore]
+       DATABASE = "mysql"
+   @endverbatim
  * 2) Then access mysql as root,
  * @verbatim
      $ mysql -u root -p
- * @endverbatim
+   @endverbatim
  *    and do the following. [You should replace $USER with the username
  *    that will be running the gnunetd process].
  * @verbatim
@@ -64,14 +64,14 @@
          ON gnunet.* TO $USER@localhost;
       SET PASSWORD FOR $USER@localhost=PASSWORD('$the_password_you_like');
       FLUSH PRIVILEGES;
- * @endverbatim
+   @endverbatim
  * 3) In the $HOME directory of $USER, create a ".my.cnf" file
  *    with the following lines
  * @verbatim
       [client]
       user=$USER
       password=$the_password_you_like
- * @endverbatim
+   @endverbatim
  *
  * Thats it. Note that .my.cnf file is a security risk unless its on
  * a safe partition etc. The $HOME/.my.cnf can of course be a symbolic
@@ -86,7 +86,7 @@
  * @verbatim
      $ mysql -u $USER -p $the_password_you_like
      mysql> use gnunet;
- * @endverbatim
+   @endverbatim
  *
  *    If you get the message "Database changed" it probably works.
  *
@@ -107,7 +107,7 @@
  * @verbatim
      mysql> REPAIR TABLE gn090;
      mysql> REPAIR TABLE gn072;
- * @endverbatim
+   @endverbatim
  *
  * PROBLEMS?
  *
@@ -663,7 +663,7 @@ init_params (struct Plugin *plugin,
   memset (qbind, 0, sizeof (qbind));
   off = 0;
   ft = 0;
-  while ((pc > 0) && (-1 != (ft = va_arg (ap, enum enum_field_types))))
+  while ((pc > 0) && (-1 != (int) (ft = va_arg (ap, enum enum_field_types))))
     {
       qbind[off].buffer_type = ft;
       switch (ft)
@@ -694,7 +694,7 @@ init_params (struct Plugin *plugin,
       pc--;
       off++;
     }
-  if (!((pc == 0) && (ft != -1) && (va_arg (ap, int) == -1)))
+  if (! ( (pc == 0) && (-1 != (int) ft) && (va_arg (ap, int) == -1) ) )
     {
       GNUNET_break (0);
       return GNUNET_SYSERR;
@@ -988,11 +988,11 @@ return_ok (void *cls,
 
 
 /**
- * FIXME.
+ * Run the prepared statement to get the next data item ready.
  * 
- * @param cls FIXME
- * @param ncr FIXME
- * @return FIXME
+ * @param cls not used
+ * @param nrc closure for the next request iterator
+ * @return GNUNET_OK on success, GNUNET_NO if there is no additional item
  */
 static int
 iterator_helper_prepare (void *cls,