[GNUnet-SVN] r34307 - in gnunet/src: gns gnsrecord include namestore

[gnunet]

Author: wachs
Date: 2014-09-23 11:40:54 +0200 (Tue, 23 Sep 2014)
New Revision: 34307

Modified:
   gnunet/src/gns/gnunet-service-gns.c
   gnunet/src/gnsrecord/gnsrecord_crypto.c
   gnunet/src/include/gnunet_gnsrecord_lib.h
   gnunet/src/namestore/gnunet-namestore.c
   gnunet/src/namestore/gnunet-service-namestore.c
Log:
removing unused "RF_PENDING" flag


Modified: gnunet/src/gns/gnunet-service-gns.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns.c 2014-09-22 23:50:22 UTC (rev 34306)
+++ gnunet/src/gns/gnunet-service-gns.c 2014-09-23 09:40:54 UTC (rev 34307)
@@ -416,8 +416,7 @@
   rd_public_count = 0;
   now = GNUNET_TIME_absolute_get ();
   for (i=0;i<rd_count;i++)
-    if (0 == (rd[i].flags & (GNUNET_GNSRECORD_RF_PRIVATE |
-                            GNUNET_GNSRECORD_RF_PENDING)))
+    if (0 == (rd[i].flags & GNUNET_GNSRECORD_RF_PRIVATE))
     {
       rd_public[rd_public_count] = rd[i];
       if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION))

Modified: gnunet/src/gnsrecord/gnsrecord_crypto.c
===================================================================
--- gnunet/src/gnsrecord/gnsrecord_crypto.c     2014-09-22 23:50:22 UTC (rev 
34306)
+++ gnunet/src/gnsrecord/gnsrecord_crypto.c     2014-09-23 09:40:54 UTC (rev 
34307)
@@ -243,8 +243,6 @@
       j = 0;
       for (i=0;i<rd_count;i++)
       {
-        if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_PENDING))
-          continue; /* PENDING should never be used */
         if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION))
         {
           /* encrypted blocks must never have relative expiration times, skip! 
*/

Modified: gnunet/src/include/gnunet_gnsrecord_lib.h
===================================================================
--- gnunet/src/include/gnunet_gnsrecord_lib.h   2014-09-22 23:50:22 UTC (rev 
34306)
+++ gnunet/src/include/gnunet_gnsrecord_lib.h   2014-09-23 09:40:54 UTC (rev 
34307)
@@ -104,10 +104,10 @@
   GNUNET_GNSRECORD_RF_PRIVATE = 2,
 
   /**
-   * This record was added automatically by the system
-   * and is pending user confimation.
+   * This flag is currently unused; former RF_PENDING flag
+   *
+   * GNUNET_GNSRECORD_RF_UNUSED = 4,
    */
-  GNUNET_GNSRECORD_RF_PENDING = 4,
 
   /**
    * This expiration time of the record is a relative

Modified: gnunet/src/namestore/gnunet-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-namestore.c     2014-09-22 23:50:22 UTC (rev 
34306)
+++ gnunet/src/namestore/gnunet-namestore.c     2014-09-23 09:40:54 UTC (rev 
34307)
@@ -419,8 +419,7 @@
             s,
              ets,
              (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_PRIVATE)) ? "PRIVATE" : 
"PUBLIC",
-             (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD)) ? 
"SHADOW" : "",
-             (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_PENDING)) ? "PENDING" : 
"");
+             (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD)) ? 
"SHADOW" : "");
     GNUNET_free (s);
   }
   FPRINTF (stdout, "%s", "\n");
@@ -552,8 +551,6 @@
     rde->flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;
   if (1 != is_public)
     rde->flags |= GNUNET_GNSRECORD_RF_PRIVATE;
-  if (1 == is_pending)
-    rde->flags |= GNUNET_GNSRECORD_RF_PENDING;
   if (GNUNET_YES == etime_is_rel)
   {
     rde->expiration_time = etime_rel.rel_value_us;

Modified: gnunet/src/namestore/gnunet-service-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-service-namestore.c     2014-09-22 23:50:22 UTC 
(rev 34306)
+++ gnunet/src/namestore/gnunet-service-namestore.c     2014-09-23 09:40:54 UTC 
(rev 34307)
@@ -1310,8 +1310,7 @@
                        rd);
   do_refresh_block = GNUNET_NO;
   for (i=0;i<rd_count;i++)
-    if(  (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION)) &&
-         (0 == (rd[i].flags & GNUNET_GNSRECORD_RF_PENDING)) )
+    if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION))
     {
       do_refresh_block = GNUNET_YES;
       break;