more work on gnunet-zoneimport, some bugfix in flat namestore, misc. style fixes

1 files changed, 8 insertions, 5 deletions

diff --git a/src/namestore/plugin_namestore_postgres.c b/src/namestore/plugin_namestore_postgres.c
index 491cec1cb..de8d76853 100644
--- a/src/namestore/plugin_namestore_postgres.c
+++ b/src/namestore/plugin_namestore_postgres.c
@@ -217,10 +217,14 @@ namestore_postgres_store_records (void *cls,
       GNUNET_PQ_query_param_end
     };
     enum GNUNET_DB_QueryStatus res;
-
-    if (data_size !=
-        GNUNET_GNSRECORD_records_serialize (rd_count, rd,
-                                            data_size, data))
+    ssize_t ret;
+
+    ret = GNUNET_GNSRECORD_records_serialize (rd_count,
+                                              rd,
+                                              data_size,
+                                              data);
+    if ( (ret < 0) ||
+         (data_size != (size_t) ret) )        
     {
       GNUNET_break (0);
       return GNUNET_SYSERR;
@@ -469,7 +473,6 @@ namestore_postgres_zone_to_name (void *cls,
   pc.iter = iter;
   pc.iter_cls = iter_cls;
   pc.zone_key = zone;
-
   res = GNUNET_PQ_eval_prepared_multi_select (plugin->dbh,
                                               "zone_to_name",
                                               params,