5 files changed, 3 insertions, 12 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index a2bebcb28..b65cfdaca 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -125,7 +125,6 @@ src/gns/gns_api.c
 src/gns/gns_common.c
 src/gns/gnunet-dns2gns.c
 src/gns/gnunet-gns.c
-src/gns/gnunet-gns-fcfsd.c
 src/gns/gnunet-gns-helper-service-w32.c
 src/gns/gnunet-gns-proxy.c
 src/gns/gnunet-service-gns.c
@@ -162,6 +161,7 @@ src/mesh/mesh_tunnel_tree.c
 src/mesh/plugin_block_mesh.c
 src/mysql/mysql.c
 src/namestore/gnunet-namestore.c
+src/namestore/gnunet-namestore-fcfsd.c
 src/namestore/gnunet-service-namestore.c
 src/namestore/namestore_api.c
 src/namestore/namestore_api_common.c
diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c
index 4e15f3db4..751907d8d 100644
--- a/src/exit/gnunet-daemon-exit.c
+++ b/src/exit/gnunet-daemon-exit.c
@@ -613,7 +613,7 @@ hash_redirect_info (struct GNUNET_HashCode *hash,
   memcpy (off, &ri->local_address.port, sizeof (uint16_t));
   off += sizeof (uint16_t);
   memcpy (off, &ri->remote_address.proto, sizeof (uint8_t));
-  off += sizeof (uint8_t);
+  /* off += sizeof (uint8_t); */
 }
 
 
diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c
index 4f6eeb435..9f9a524e3 100644
--- a/src/namestore/gnunet-namestore.c
+++ b/src/namestore/gnunet-namestore.c
@@ -581,14 +581,6 @@ testservice_task (void *cls,
   }
   if (list)
   {
-    uint32_t must_not_flags = 0;
-
-    if (1 == nonauthority) /* List non-authority records */
-      must_not_flags |= GNUNET_NAMESTORE_RF_AUTHORITY;
-
-    if (1 == public)
-      must_not_flags |= GNUNET_NAMESTORE_RF_PRIVATE;
-
     list_it = GNUNET_NAMESTORE_zone_iteration_start (ns,
                                                      zone_pkey,
                                                      &display_record,
diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c
index 7e8ee12a6..0a3da174b 100644
--- a/src/namestore/plugin_namestore_sqlite.c
+++ b/src/namestore/plugin_namestore_sqlite.c
@@ -697,7 +697,6 @@ get_record_and_call_iterator (struct Plugin *plugin,
   ret = GNUNET_NO;
   if (SQLITE_ROW == (sret = sqlite3_step (stmt)))
   {     
-    ret = GNUNET_YES;
     record_count = sqlite3_column_int (stmt, 0);
     data_size = sqlite3_column_bytes (stmt, 1);
     data = sqlite3_column_blob (stmt, 1);
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c
index e2cf3e5c9..172e778f6 100644
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/vpn/gnunet-service-vpn.c
@@ -454,7 +454,7 @@ get_tunnel_key_from_ips (int af,
     break;
   }
   memcpy (off, &protocol, sizeof (uint8_t));
-  off += sizeof (uint8_t);  
+  /* off += sizeof (uint8_t);  */
 }