gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r7049 - in GNUnet: libltdl src/applications/chat/tools src/


From: gnunet
Subject: [GNUnet-SVN] r7049 - in GNUnet: libltdl src/applications/chat/tools src/applications/datastore src/applications/fs/collection src/applications/fs/ecrs src/applications/fs/tools src/applications/sqstore_mysql src/applications/testing src/server src/setup/lib src/setup/ncurses src/transports src/util/network_client
Date: Wed, 4 Jun 2008 00:06:03 -0600 (MDT)

Author: grothoff
Date: 2008-06-04 00:06:03 -0600 (Wed, 04 Jun 2008)
New Revision: 7049

Modified:
   GNUnet/libltdl/ltdl.c
   GNUnet/src/applications/chat/tools/gnunet-chat.c
   GNUnet/src/applications/datastore/datastore.c
   GNUnet/src/applications/fs/collection/collection.c
   GNUnet/src/applications/fs/ecrs/namespace.c
   GNUnet/src/applications/fs/tools/gnunet-unindex.c
   GNUnet/src/applications/sqstore_mysql/mysql.c
   GNUnet/src/applications/testing/remote.c
   GNUnet/src/applications/testing/remotetopologies.c
   GNUnet/src/applications/testing/testing.c
   GNUnet/src/server/connection.c
   GNUnet/src/setup/lib/gns.c
   GNUnet/src/setup/ncurses/mconf.c
   GNUnet/src/transports/http.c
   GNUnet/src/util/network_client/tcpio.c
Log:
indent

Modified: GNUnet/libltdl/ltdl.c
===================================================================
--- GNUnet/libltdl/ltdl.c       2008-06-04 06:02:23 UTC (rev 7048)
+++ GNUnet/libltdl/ltdl.c       2008-06-04 06:06:03 UTC (rev 7049)
@@ -1770,9 +1770,9 @@
                                                                *) (((struct
                                                                      
dylib_command
                                                                      *)
-                                                                    lc)->dylib.
-                                                                   name.offset
-                                                                   +
+                                                                    lc)->
+                                                                   dylib.name.
+                                                                   offset +
                                                                    (unsigned
                                                                     long)
                                                                    lc));

Modified: GNUnet/src/applications/chat/tools/gnunet-chat.c
===================================================================
--- GNUnet/src/applications/chat/tools/gnunet-chat.c    2008-06-04 06:02:23 UTC 
(rev 7048)
+++ GNUnet/src/applications/chat/tools/gnunet-chat.c    2008-06-04 06:06:03 UTC 
(rev 7049)
@@ -407,13 +407,13 @@
    ("Use `/names' to list all of the current members in the chat room")},
   {"/help", &do_help,
    gettext_noop ("Use `/help command' to get help for a specific command")},
-  /* Add standard commands: 
+  /* Add standard commands:
      /help (print help texts),
-     /whois (print metadata), 
+     /whois (print metadata),
      /ignore (set flag, check on receive!) */
   /* Add special commands (currently supported):
      + anonymous msgs
-     + authenticated msgs 
+     + authenticated msgs
    */
   /* the following three commands must be last! */
   {"/", &do_unknown, NULL},

Modified: GNUnet/src/applications/datastore/datastore.c
===================================================================
--- GNUnet/src/applications/datastore/datastore.c       2008-06-04 06:02:23 UTC 
(rev 7048)
+++ GNUnet/src/applications/datastore/datastore.c       2008-06-04 06:06:03 UTC 
(rev 7049)
@@ -389,9 +389,9 @@
       stat_filter_failed =
         stats->create (gettext_noop ("# bloom filter false positives"));
 
-      stats->
-        set (stats->create (gettext_noop ("# bytes allowed in datastore")),
-             quota);
+      stats->set (stats->
+                  create (gettext_noop ("# bytes allowed in datastore")),
+                  quota);
     }
   state = capi->service_request ("state");
   if (state != NULL)

Modified: GNUnet/src/applications/fs/collection/collection.c
===================================================================
--- GNUnet/src/applications/fs/collection/collection.c  2008-06-04 06:02:23 UTC 
(rev 7048)
+++ GNUnet/src/applications/fs/collection/collection.c  2008-06-04 06:06:03 UTC 
(rev 7049)
@@ -575,9 +575,12 @@
                     GNUNET_OK == GNUNET_ECRS_directory_create (ectx,
                                                                &dirData,
                                                                &dirLen,
-                                                               
collectionData->file_count,
-                                                               
collectionData->files,
-                                                               
collectionData->meta));
+                                                               collectionData->
+                                                               file_count,
+                                                               collectionData->
+                                                               files,
+                                                               collectionData->
+                                                               meta));
   if (-1 == WRITE (fd, dirData, dirLen))
     {
       GNUNET_GE_LOG_STRERROR (ectx,
@@ -591,10 +594,10 @@
   GNUNET_free (dirData);
   CLOSE (fd);
   if (GNUNET_OK != GNUNET_ECRS_file_upload (ectx, cfg, tmpName, GNUNET_NO,     
 /* indexing */
-                                            ntohl (collectionData->
-                                                   data.anonymityLevel),
-                                            ntohl (collectionData->
-                                                   data.priority),
+                                            ntohl (collectionData->data.
+                                                   anonymityLevel),
+                                            ntohl (collectionData->data.
+                                                   priority),
                                             GNUNET_get_time () +
                                             COLLECTION_ADV_LIFETIME, NULL,
                                             NULL, NULL, NULL, &directoryURI))
@@ -609,14 +612,14 @@
   uri = GNUNET_ECRS_namespace_add_content (ectx,
                                            cfg,
                                            &collectionData->data.pid,
-                                           ntohl (collectionData->
-                                                  data.anonymityLevel),
-                                           ntohl (collectionData->
-                                                  data.priority),
+                                           ntohl (collectionData->data.
+                                                  anonymityLevel),
+                                           ntohl (collectionData->data.
+                                                  priority),
                                            GNUNET_get_time () +
                                            COLLECTION_ADV_LIFETIME, now,
-                                           ntohl (collectionData->
-                                                  data.updateInterval),
+                                           ntohl (collectionData->data.
+                                                  updateInterval),
                                            &collectionData->data.lastId,
                                            &collectionData->data.nextId,
                                            directoryURI,

Modified: GNUnet/src/applications/fs/ecrs/namespace.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/namespace.c 2008-06-04 06:02:23 UTC (rev 
7048)
+++ GNUnet/src/applications/fs/ecrs/namespace.c 2008-06-04 06:06:03 UTC (rev 
7049)
@@ -306,8 +306,8 @@
                                                           (GNUNET_EC_NBlock) +
                                                           mdsize,
                                                           &knb->nblock,
-                                                          &knb->
-                                                          kblock.signature));
+                                                          &knb->kblock.
+                                                          signature));
           /* extra check: verify sig */
           GNUNET_RSA_free_key (pk);
           if (GNUNET_OK != GNUNET_FS_insert (sock, knvalue))

Modified: GNUnet/src/applications/fs/tools/gnunet-unindex.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-unindex.c   2008-06-04 06:02:23 UTC 
(rev 7048)
+++ GNUnet/src/applications/fs/tools/gnunet-unindex.c   2008-06-04 06:06:03 UTC 
(rev 7049)
@@ -75,9 +75,9 @@
                   event->data.UnindexCompleted.total,
                   delta / GNUNET_CRON_SECONDS,
                   (delta ==
-                   0) ? (double) (-1.0) : (double) (event->
-                                                    data.UnindexCompleted.
-                                                    total / 1024.0 *
+                   0) ? (double) (-1.0) : (double) (event->data.
+                                                    UnindexCompleted.total /
+                                                    1024.0 *
                                                     GNUNET_CRON_SECONDS /
                                                     delta));
         }

Modified: GNUnet/src/applications/sqstore_mysql/mysql.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysql.c       2008-06-04 06:02:23 UTC 
(rev 7048)
+++ GNUnet/src/applications/sqstore_mysql/mysql.c       2008-06-04 06:06:03 UTC 
(rev 7049)
@@ -1273,8 +1273,8 @@
   if (type != 0)
     stmt =
       (vhash !=
-       NULL) ? dbh->
-      count_entry_by_hash_vhash_and_type : dbh->count_entry_by_hash_and_type;
+       NULL) ? dbh->count_entry_by_hash_vhash_and_type : dbh->
+      count_entry_by_hash_and_type;
   else
     stmt =
       (vhash !=
@@ -1416,8 +1416,8 @@
       else
         stmt =
           (vhash !=
-           NULL) ? dbh->
-          select_entry_by_hash_and_vhash : dbh->select_entry_by_hash;
+           NULL) ? dbh->select_entry_by_hash_and_vhash : dbh->
+          select_entry_by_hash;
       if (count == 0)
         limit_off = off;
       else

Modified: GNUnet/src/applications/testing/remote.c
===================================================================
--- GNUnet/src/applications/testing/remote.c    2008-06-04 06:02:23 UTC (rev 
7048)
+++ GNUnet/src/applications/testing/remote.c    2008-06-04 06:06:03 UTC (rev 
7049)
@@ -421,7 +421,8 @@
                   GNUNET_REMOTE_start_daemon (remote_gnunetd_path, "/tmp/",
                                               temp, remote_config_path,
                                               curr_host, ssh_username,
-                                              
temp_pos->remote_friend_file_path);
+                                              temp_pos->
+                                              remote_friend_file_path);
 
                   GNUNET_GC_get_configuration_value_number (basecfg,
                                                             "NETWORK",

Modified: GNUnet/src/applications/testing/remotetopologies.c
===================================================================
--- GNUnet/src/applications/testing/remotetopologies.c  2008-06-04 06:02:23 UTC 
(rev 7048)
+++ GNUnet/src/applications/testing/remotetopologies.c  2008-06-04 06:06:03 UTC 
(rev 7049)
@@ -370,13 +370,15 @@
             {
               fprintf (stderr, ".");
               if (GNUNET_YES == GNUNET_IDENTITY_request_connect (sock1,
-                                                                 
&h2->senderIdentity))
+                                                                 &h2->
+                                                                 
senderIdentity))
                 {
                   ret = GNUNET_OK;
                   break;
                 }
               if (GNUNET_YES == GNUNET_IDENTITY_request_connect (sock2,
-                                                                 
&h1->senderIdentity))
+                                                                 &h1->
+                                                                 
senderIdentity))
                 {
                   ret = GNUNET_OK;
                   break;

Modified: GNUnet/src/applications/testing/testing.c
===================================================================
--- GNUnet/src/applications/testing/testing.c   2008-06-04 06:02:23 UTC (rev 
7048)
+++ GNUnet/src/applications/testing/testing.c   2008-06-04 06:06:03 UTC (rev 
7049)
@@ -277,7 +277,8 @@
             {
               fprintf (stderr, ".");
               if (GNUNET_YES == GNUNET_IDENTITY_request_connect (sock1,
-                                                                 
&h2->senderIdentity))
+                                                                 &h2->
+                                                                 
senderIdentity))
                 {
                   ret = GNUNET_OK;
                   GNUNET_free_non_null (h1);
@@ -285,7 +286,8 @@
                   break;
                 }
               if (GNUNET_YES == GNUNET_IDENTITY_request_connect (sock2,
-                                                                 
&h1->senderIdentity))
+                                                                 &h1->
+                                                                 
senderIdentity))
                 {
                   ret = GNUNET_OK;
                   GNUNET_free_non_null (h1);

Modified: GNUnet/src/server/connection.c
===================================================================
--- GNUnet/src/server/connection.c      2008-06-04 06:02:23 UTC (rev 7048)
+++ GNUnet/src/server/connection.c      2008-06-04 06:06:03 UTC (rev 7049)
@@ -721,8 +721,8 @@
           if (root->session.tsession != NULL)
             GNUNET_GE_ASSERT (NULL,
                               GNUNET_OK ==
-                              transport->assert_associated (root->
-                                                            session.tsession,
+                              transport->assert_associated (root->session.
+                                                            tsession,
                                                             __FILE__));
           root = root->overflowChain;
         }
@@ -1903,8 +1903,8 @@
         stats->change (stat_transmitted, p);
       be->available_send_window -= p;
       be->lastSequenceNumberSend++;
-      GNUNET_CORE_connection_reserve_downstream_bandwidth (&be->
-                                                           session.sender, 0);
+      GNUNET_CORE_connection_reserve_downstream_bandwidth (&be->session.
+                                                           sender, 0);
       if (be->idealized_limit > be->max_transmitted_limit)
         be->max_transmitted_limit = be->idealized_limit;
       else                      /* age */
@@ -2484,8 +2484,8 @@
         {
           IF_GELOG (ectx,
                     GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_USER,
-                    GNUNET_hash_to_enc (&entries[u]->session.
-                                        sender.hashPubKey, &enc));
+                    GNUNET_hash_to_enc (&entries[u]->session.sender.
+                                        hashPubKey, &enc));
           GNUNET_GE_LOG (ectx,
                          GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_USER,
                          "peer `%s' transmitted above limit: %llu bpm > %u 
bpm\n",
@@ -2508,8 +2508,8 @@
 #if DEBUG_CONNECTION
               IF_GELOG (ectx,
                         GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_DEVELOPER,
-                        GNUNET_hash_to_enc (&entries[u]->session.
-                                            sender.hashPubKey, &enc));
+                        GNUNET_hash_to_enc (&entries[u]->session.sender.
+                                            hashPubKey, &enc));
               GNUNET_GE_LOG (ectx,
                              GNUNET_GE_INFO | GNUNET_GE_BULK |
                              GNUNET_GE_DEVELOPER,
@@ -2570,8 +2570,8 @@
   for (u = 0; u < activePeerCount; u++)
     {
       GNUNET_CORE_connection_reserve_downstream_bandwidth (&entries
-                                                           [u]->session.
-                                                           sender, 0);
+                                                           [u]->
+                                                           session.sender, 0);
       entries[u]->idealized_limit = 0;
     }
   while ((schedulableBandwidth > activePeerCount * 100) &&
@@ -2905,8 +2905,8 @@
                   IF_GELOG (ectx,
                             GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
                             GNUNET_GE_DEVELOPER,
-                            GNUNET_hash_to_enc (&root->session.
-                                                sender.hashPubKey, &enc));
+                            GNUNET_hash_to_enc (&root->session.sender.
+                                                hashPubKey, &enc));
                   GNUNET_GE_LOG (ectx,
                                  GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
                                  GNUNET_GE_DEVELOPER,
@@ -3009,8 +3009,8 @@
                   IF_GELOG (ectx,
                             GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
                             GNUNET_GE_DEVELOPER,
-                            GNUNET_hash_to_enc (&root->session.
-                                                sender.hashPubKey, &enc));
+                            GNUNET_hash_to_enc (&root->session.sender.
+                                                hashPubKey, &enc));
                   GNUNET_GE_LOG (ectx,
                                  GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
                                  GNUNET_GE_DEVELOPER,

Modified: GNUnet/src/setup/lib/gns.c
===================================================================
--- GNUnet/src/setup/lib/gns.c  2008-06-04 06:02:23 UTC (rev 7048)
+++ GNUnet/src/setup/lib/gns.c  2008-06-04 06:06:03 UTC (rev 7049)
@@ -123,8 +123,8 @@
         val = GNUNET_GC_get_configuration_value_yesno (cfg,
                                                        section,
                                                        option,
-                                                       pos->value.
-                                                       Boolean.def);
+                                                       pos->value.Boolean.
+                                                       def);
         if (val == GNUNET_SYSERR)
           {
             return GNUNET_SYSERR;
@@ -139,9 +139,18 @@
         if (GNUNET_SYSERR == GNUNET_GC_get_configuration_value_number (cfg,
                                                                        section,
                                                                        option,
-                                                                       
pos->value.UInt64.min,
-                                                                       
pos->value.UInt64.max,
-                                                                       
pos->value.UInt64.def,
+                                                                       pos->
+                                                                       value.
+                                                                       UInt64.
+                                                                       min,
+                                                                       pos->
+                                                                       value.
+                                                                       UInt64.
+                                                                       max,
+                                                                       pos->
+                                                                       value.
+                                                                       UInt64.
+                                                                       def,
                                                                        &val))
           {
             return GNUNET_SYSERR;
@@ -186,7 +195,10 @@
         if (GNUNET_SYSERR == GNUNET_GC_get_configuration_value_string (cfg,
                                                                        section,
                                                                        option,
-                                                                       
pos->value.String.def,
+                                                                       pos->
+                                                                       value.
+                                                                       String.
+                                                                       def,
                                                                        &val))
           return GNUNET_SYSERR;
         GNUNET_free (pos->value.String.val);
@@ -203,8 +215,14 @@
                                                                        (const
                                                                         char
                                                                         **)
-                                                                       
pos->value.String.legalRange,
-                                                                       
pos->value.String.def,
+                                                                       pos->
+                                                                       value.
+                                                                       String.
+                                                                       
legalRange,
+                                                                       pos->
+                                                                       value.
+                                                                       String.
+                                                                       def,
                                                                        &ival))
           return GNUNET_SYSERR;
         GNUNET_free (pos->value.String.val);

Modified: GNUnet/src/setup/ncurses/mconf.c
===================================================================
--- GNUnet/src/setup/ncurses/mconf.c    2008-06-04 06:02:23 UTC (rev 7048)
+++ GNUnet/src/setup/ncurses/mconf.c    2008-06-04 06:06:03 UTC (rev 7049)
@@ -179,8 +179,10 @@
                 case DLG_EXIT_CANCEL:
                   if (0 != GNUNET_GC_set_configuration_value_string (cfg,
                                                                      ectx,
-                                                                     
pos->section,
-                                                                     
pos->option,
+                                                                     pos->
+                                                                     section,
+                                                                     pos->
+                                                                     option,
                                                                      st ==
                                                                      
DLG_EXIT_OK
                                                                      ? "YES" :
@@ -215,9 +217,12 @@
                 case DLG_EXIT_OK:
                   if (0 != GNUNET_GC_set_configuration_value_string (cfg,
                                                                      ectx,
-                                                                     
pos->section,
-                                                                     
pos->option,
-                                                                     
fitem.text))
+                                                                     pos->
+                                                                     section,
+                                                                     pos->
+                                                                     option,
+                                                                     fitem.
+                                                                     text))
                     {
                       show_help (pos->option,
                                  gettext_noop
@@ -279,9 +284,13 @@
                 case DLG_EXIT_OK:
                   if (0 != GNUNET_GC_set_configuration_value_choice (cfg,
                                                                      ectx,
-                                                                     
pos->section,
-                                                                     
pos->option,
-                                                                     
val->String.legalRange
+                                                                     pos->
+                                                                     section,
+                                                                     pos->
+                                                                     option,
+                                                                     val->
+                                                                     String.
+                                                                     legalRange
                                                                      [msel]))
                     {
                       show_help (pos->option,
@@ -360,8 +369,10 @@
                     tmp[strlen (tmp) - 1] = '\0';
                   if (0 != GNUNET_GC_set_configuration_value_choice (cfg,
                                                                      ectx,
-                                                                     
pos->section,
-                                                                     
pos->option,
+                                                                     pos->
+                                                                     section,
+                                                                     pos->
+                                                                     option,
                                                                      tmp))
                     {
                       GNUNET_free (tmp);
@@ -405,9 +416,12 @@
                     }
                   if (0 != GNUNET_GC_set_configuration_value_string (cfg,
                                                                      ectx,
-                                                                     
pos->section,
-                                                                     
pos->option,
-                                                                     
fitem.text))
+                                                                     pos->
+                                                                     section,
+                                                                     pos->
+                                                                     option,
+                                                                     fitem.
+                                                                     text))
                     {
                       show_help (pos->option,
                                  gettext_noop
@@ -456,8 +470,10 @@
                         }
                       if (0 != GNUNET_GC_set_configuration_value_number (cfg,
                                                                          ectx,
-                                                                         
pos->section,
-                                                                         
pos->option,
+                                                                         pos->
+                                                                         
section,
+                                                                         pos->
+                                                                         
option,
                                                                          lval))
                         {
                           show_help (pos->option,

Modified: GNUnet/src/transports/http.c
===================================================================
--- GNUnet/src/transports/http.c        2008-06-04 06:02:23 UTC (rev 7048)
+++ GNUnet/src/transports/http.c        2008-06-04 06:06:03 UTC (rev 7049)
@@ -1049,9 +1049,8 @@
           cpy = sizeof (GNUNET_MessageHeader) - httpSession->cs.client.rpos1;
           if (cpy > have)
             cpy = have;
-          memcpy (&httpSession->cs.
-                  client.rbuff1[httpSession->cs.client.rpos1], &inbuf[poff],
-                  cpy);
+          memcpy (&httpSession->cs.client.
+                  rbuff1[httpSession->cs.client.rpos1], &inbuf[poff], cpy);
           httpSession->cs.client.rpos1 += cpy;
           have -= cpy;
           poff += cpy;
@@ -1071,9 +1070,8 @@
             httpSession->cs.client.rpos2;
           if (cpy > have)
             cpy = have;
-          memcpy (&httpSession->cs.
-                  client.rbuff2[httpSession->cs.client.rpos2], &inbuf[poff],
-                  cpy);
+          memcpy (&httpSession->cs.client.
+                  rbuff2[httpSession->cs.client.rpos2], &inbuf[poff], cpy);
           have -= cpy;
           poff += cpy;
           httpSession->cs.client.rpos2 += cpy;

Modified: GNUnet/src/util/network_client/tcpio.c
===================================================================
--- GNUnet/src/util/network_client/tcpio.c      2008-06-04 06:02:23 UTC (rev 
7048)
+++ GNUnet/src/util/network_client/tcpio.c      2008-06-04 06:06:03 UTC (rev 
7049)
@@ -276,7 +276,7 @@
   if (host == NULL)
     return GNUNET_SYSERR;
   af_index = 0;
-  /* we immediately advance if there is a DNS lookup error 
+  /* we immediately advance if there is a DNS lookup error
    * (which would likely persist) or a socket API error
    * (which would equally likely persist).  We retry a
    * few times with a small delay if we may just be having





reply via email to

[Prev in Thread] Current Thread [Next in Thread]