[GNUnet-SVN] r28608 - in gnunet: po src/exit src/namestore src/vpn

[gnunet]

Author: grothoff
Date: 2013-08-14 01:00:30 +0200 (Wed, 14 Aug 2013)
New Revision: 28608

Modified:
   gnunet/po/POTFILES.in
   gnunet/src/exit/gnunet-daemon-exit.c
   gnunet/src/namestore/gnunet-namestore.c
   gnunet/src/namestore/plugin_namestore_sqlite.c
   gnunet/src/vpn/gnunet-service-vpn.c
Log:
-dce

Modified: gnunet/po/POTFILES.in
===================================================================
--- gnunet/po/POTFILES.in       2013-08-13 22:57:40 UTC (rev 28607)
+++ gnunet/po/POTFILES.in       2013-08-13 23:00:30 UTC (rev 28608)
@@ -125,7 +125,6 @@
 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/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

Modified: gnunet/src/exit/gnunet-daemon-exit.c
===================================================================
--- gnunet/src/exit/gnunet-daemon-exit.c        2013-08-13 22:57:40 UTC (rev 
28607)
+++ gnunet/src/exit/gnunet-daemon-exit.c        2013-08-13 23:00:30 UTC (rev 
28608)
@@ -613,7 +613,7 @@
   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); */
 }
 
 

Modified: gnunet/src/namestore/gnunet-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-namestore.c     2013-08-13 22:57:40 UTC (rev 
28607)
+++ gnunet/src/namestore/gnunet-namestore.c     2013-08-13 23:00:30 UTC (rev 
28608)
@@ -581,14 +581,6 @@
   }
   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,

Modified: gnunet/src/namestore/plugin_namestore_sqlite.c
===================================================================
--- gnunet/src/namestore/plugin_namestore_sqlite.c      2013-08-13 22:57:40 UTC 
(rev 28607)
+++ gnunet/src/namestore/plugin_namestore_sqlite.c      2013-08-13 23:00:30 UTC 
(rev 28608)
@@ -697,7 +697,6 @@
   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);

Modified: gnunet/src/vpn/gnunet-service-vpn.c
===================================================================
--- gnunet/src/vpn/gnunet-service-vpn.c 2013-08-13 22:57:40 UTC (rev 28607)
+++ gnunet/src/vpn/gnunet-service-vpn.c 2013-08-13 23:00:30 UTC (rev 28608)
@@ -454,7 +454,7 @@
     break;
   }
   memcpy (off, &protocol, sizeof (uint8_t));
-  off += sizeof (uint8_t);  
+  /* off += sizeof (uint8_t);  */
 }