[GNUnet-SVN] r24601 - gnunet/src/gns

[gnunet]

Author: schanzen
Date: 2012-10-30 07:17:19 +0100 (Tue, 30 Oct 2012)
New Revision: 24601

Modified:
   gnunet/src/gns/gnunet-service-gns_resolver.c
Log:
-cleanup

Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c        2012-10-29 22:17:26 UTC 
(rev 24600)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c        2012-10-30 06:17:19 UTC 
(rev 24601)
@@ -1063,7 +1063,7 @@
       return;
     }
 
-    for (i=0; i<num_records; i++)
+    for (i = 0; i < num_records; i++)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "GNS_PHASE_REC-%llu: Got name: %s (wanted %s)\n",
@@ -1080,9 +1080,7 @@
 
       if ((strcmp (name, rh->name) == 0) &&
           (rd[i].record_type == rlh->record_type))
-      {
         rh->answered++;
-      }
 
     }
 
@@ -1122,9 +1120,9 @@
 
   
     if (0 < rh->answered)
-     rh->proc (rh->proc_cls, rh, num_records, rd);
-   else
-     rh->proc (rh->proc_cls, rh, 0, NULL);
+      rh->proc (rh->proc_cls, rh, num_records, rd);
+    else
+      rh->proc (rh->proc_cls, rh, 0, NULL);
   }
 
 }
@@ -1255,9 +1253,7 @@
     rh->status |= RSL_RECORD_EXISTS;
 
     if (remaining_time.rel_value == 0)
-    {
       rh->status |= RSL_RECORD_EXPIRED;
-    }
   }
 
   if (rd_count == 0)
@@ -1282,7 +1278,7 @@
   GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
              "GNS_PHASE_REC-%llu: Processing additional result %s from 
namestore\n",
              rh->id, name);
-  for (i=0; i<rd_count;i++)
+  for (i = 0; i < rd_count;i++)
   {
     if (rd[i].record_type != rlh->record_type)
       continue;
@@ -1338,11 +1334,9 @@
 process_record_result_vpn (void* cls, int af, const void *address)
 {
   struct ResolverHandle *rh = cls;
-  struct RecordLookupHandle *rlh;
+  struct RecordLookupHandle *rlh = rh->proc_cls;
   struct GNUNET_NAMESTORE_RecordData rd;
 
-  rlh = rh->proc_cls;
-
   GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
              "GNS_PHASE_REC_VPN-%llu: Got answer from VPN to query!\n",
              rh->id);