gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r3193 - in GNUnet/src: applications/advertising application


From: grothoff
Subject: [GNUnet-SVN] r3193 - in GNUnet/src: applications/advertising applications/datastore applications/dht/module applications/fs/ecrs applications/fs/lib applications/fs/module applications/gap applications/identity applications/sqstore_mysql applications/sqstore_sqlite transports
Date: Sun, 30 Jul 2006 20:36:29 -0700 (PDT)

Author: grothoff
Date: 2006-07-30 20:36:25 -0700 (Sun, 30 Jul 2006)
New Revision: 3193

Modified:
   GNUnet/src/applications/advertising/advertising.c
   GNUnet/src/applications/datastore/datastore.c
   GNUnet/src/applications/dht/module/dht.c
   GNUnet/src/applications/fs/ecrs/download.c
   GNUnet/src/applications/fs/ecrs/keyspace.c
   GNUnet/src/applications/fs/ecrs/search.c
   GNUnet/src/applications/fs/ecrs/upload.c
   GNUnet/src/applications/fs/lib/fslib.c
   GNUnet/src/applications/fs/module/fs.c
   GNUnet/src/applications/fs/module/ondemand.c
   GNUnet/src/applications/fs/module/querymanager.c
   GNUnet/src/applications/gap/gap.c
   GNUnet/src/applications/identity/identity.c
   GNUnet/src/applications/sqstore_mysql/mysql.c
   GNUnet/src/applications/sqstore_sqlite/sqlite.c
   GNUnet/src/transports/http.c
Log:
ifge_log -> if_gelog

Modified: GNUnet/src/applications/advertising/advertising.c
===================================================================
--- GNUnet/src/applications/advertising/advertising.c   2006-07-31 03:29:21 UTC 
(rev 3192)
+++ GNUnet/src/applications/advertising/advertising.c   2006-07-31 03:36:25 UTC 
(rev 3193)
@@ -154,7 +154,7 @@
                          &msg->signature,
                          &msg->publicKey)) {
     EncName enc;
-    IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
+    IF_GELOG(ectx, GE_WARNING | GE_BULK | GE_USER,
          hash2enc(&msg->senderIdentity.hashPubKey,
                   &enc));
     GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
@@ -362,7 +362,7 @@
   if (weak_randomi(sd->n) != 0)
     return;
 #if DEBUG_ADVERTISING
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(&hi->hashPubKey,
                 &other));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -570,7 +570,7 @@
   if ((TIME_T)ntohl(helo->expirationTime) < now) {
     EncName enc;
     /* remove hellos that expired */
-    IFGE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
+    IF_GELOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
          hash2enc(&peer->hashPubKey,
                   &enc));
     GE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,

Modified: GNUnet/src/applications/datastore/datastore.c
===================================================================
--- GNUnet/src/applications/datastore/datastore.c       2006-07-31 03:29:21 UTC 
(rev 3192)
+++ GNUnet/src/applications/datastore/datastore.c       2006-07-31 03:36:25 UTC 
(rev 3193)
@@ -86,7 +86,7 @@
 #if DEBUG_DATASTORE
     EncName enc;
 
-    IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+    IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
          hash2enc(query,
                   &enc));
     GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -111,7 +111,7 @@
   int i;
 
   if (! testAvailable(query)) {
-    IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
+    IF_GELOG(ectx, GE_WARNING | GE_BULK | GE_USER,
          hash2enc(query,
                   &enc));
     GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
@@ -127,7 +127,7 @@
       available += ntohl(value->size);
     }
 #if DEBUG_DATASTORE
-    IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+    IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
          hash2enc(query,
                   &enc));
     GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -135,7 +135,7 @@
        &enc);
 #endif
   } else {
-    IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
+    IF_GELOG(ectx, GE_WARNING | GE_BULK | GE_USER,
          hash2enc(query,
                   &enc));
     GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,

Modified: GNUnet/src/applications/dht/module/dht.c
===================================================================
--- GNUnet/src/applications/dht/module/dht.c    2006-07-31 03:29:21 UTC (rev 
3192)
+++ GNUnet/src/applications/dht/module/dht.c    2006-07-31 03:36:25 UTC (rev 
3193)
@@ -939,7 +939,7 @@
                                 (void**)&data)) {
     tableCount = dataLength / sizeof(DHT_TableId);
     if (tableCount * sizeof(DHT_TableId) != dataLength) {
-      IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
+      IF_GELOG(ectx, GE_WARNING | GE_BULK | GE_USER,
            hash2enc(&responder->hashPubKey,
                     &enc));
       GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
@@ -952,7 +952,7 @@
     cronTime(&now);
 
 #if DEBUG_DHT
-    IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+    IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
          hash2enc(&responder->hashPubKey,
                   &enc));
     GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -966,7 +966,7 @@
     pos = findPeerInfo(responder);
     bucket = findBucket(responder);
     if (bucket == NULL) {
-      IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
+      IF_GELOG(ectx, GE_WARNING | GE_BULK | GE_USER,
            hash2enc(&responder->hashPubKey,
                     &enc));
       GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
@@ -1011,7 +1011,7 @@
     }
     if (pos == NULL) {
 #if DEBUG_DHT
-      IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+      IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
            hash2enc(&responder->hashPubKey,
                     &enc));
       GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1020,7 +1020,7 @@
 #endif
     } else {
 #if DEBUG_DHT
-      IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+      IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
            hash2enc(&responder->hashPubKey,
                     &enc));
       GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1113,7 +1113,7 @@
                                 "peer",
                                 &dataLength,
                                 (void**) &value)) {
-    IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
+    IF_GELOG(ectx, GE_WARNING | GE_BULK | GE_USER,
          hash2enc(&responder->hashPubKey,
                   &enc));
     GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
@@ -1128,7 +1128,7 @@
      the peer will automatically trigger the ping_reply_handler
      which will in turn trigger create_find_nodes_rpc) */
   if ( (dataLength % sizeof(PeerIdentity)) != 0) {
-    IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
+    IF_GELOG(ectx, GE_WARNING | GE_BULK | GE_USER,
          hash2enc(&responder->hashPubKey,
                   &enc));
     GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
@@ -1142,14 +1142,14 @@
 
     msg = (PeerIdentity*) &value[pos];
 #if DEBUG_DHT
-    IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+    IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
          hash2enc(&responder->hashPubKey,
                   &enc));
     GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        "processing PeerID received from peer `%s' in response to `%s' RPC.\n",
        &enc,
        "DHT_findNode");
-    IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+    IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
          hash2enc(&msg->hashPubKey,
                   &enc));
     GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1178,7 +1178,7 @@
 #if DEBUG_DHT
   EncName enc;
 
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(&peer->hashPubKey,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1263,7 +1263,7 @@
   }
 
 #if DEBUG_DHT
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(&responder->hashPubKey,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1297,7 +1297,7 @@
 #if DEBUG_DHT
   EncName enc;
 
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(&identity->hashPubKey,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1362,7 +1362,7 @@
 #if DEBUG_DHT
   EncName enc;
 
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(table,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1383,7 +1383,7 @@
 #if DEBUG_DHT
          EncName enc;
        
-         IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+         IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
                hash2enc(&pos->id.hashPubKey,
                         &enc));
          GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1428,7 +1428,7 @@
 
   max = RPC_paramCount(results);
 #if DEBUG_DHT
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(&responder->hashPubKey,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1477,7 +1477,7 @@
   EncName enc;
 
   ENTER();
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(&peer->hashPubKey,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1585,10 +1585,10 @@
   int res;
 
   ENTER();
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(&keys[0],
                 &enc));
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(table,
                 &enc2));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1630,7 +1630,7 @@
   if (ltd != NULL) {
     PeerIdentity * hosts;
 #if DEBUG_DHT
-    IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+    IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
          hash2enc(table,
                   &enc));
     GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1671,7 +1671,7 @@
                              (DataProcessor)&getLocalResultCallback,
                              ret);
 #if DEBUG_DHT
-       IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+       IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
              hash2enc(&keys[0],
                       &enc));
        GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1689,7 +1689,7 @@
        if (! hostIdentityEquals(coreAPI->myIdentity,
                                 &hosts[i])) {
 #if DEBUG_DHT
-         IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+         IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
                hash2enc(&hosts[i].hashPubKey,
                         &enc));
          GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1704,7 +1704,7 @@
     }
   } else {
 #if DEBUG_DHT
-    IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+    IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
          hash2enc(table,
                   &enc));
     GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1841,7 +1841,7 @@
   EncName enc;
 
   ENTER();
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(table,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1897,7 +1897,7 @@
                                    fnc);
     } else {
 #if DEBUG_DHT
-      IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+      IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
            hash2enc(table,
                     &enc));
       GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1999,7 +1999,7 @@
 
     msg = &value[pos];
 #if DEBUG_DHT
-    IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+    IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
          hash2enc(&msg->hashPubKey,
                   &enc));
     GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -2229,7 +2229,7 @@
 #if DEBUG_DHT
   EncName enc;
 
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(&peer->hashPubKey,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -2323,10 +2323,10 @@
   }
 
   ENTER();
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(key,
                 &enc));
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(table,
                 &enc2));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -2362,7 +2362,7 @@
   if (ltd != NULL) {
     PeerIdentity * hosts;
 #if DEBUG_DHT
-    IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+    IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
          hash2enc(table,
                   &enc));
     GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -2531,7 +2531,7 @@
   EncName enc;
 
   ENTER();
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(&peer->hashPubKey,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -2826,7 +2826,7 @@
 #if DEBUG_DHT
   EncName enc;
 
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(&sender->hashPubKey,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -3504,7 +3504,7 @@
        EncName enc;
        
        ENTER();
-       IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+       IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
              hash2enc(&pos->id.hashPubKey,
                       &enc));
        GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,

Modified: GNUnet/src/applications/fs/ecrs/download.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/download.c  2006-07-31 03:29:21 UTC (rev 
3192)
+++ GNUnet/src/applications/fs/ecrs/download.c  2006-07-31 03:36:25 UTC (rev 
3193)
@@ -524,7 +524,7 @@
 #if DEBUG_DOWNLOAD
   EncName enc;
 
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(&node->chk.query,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -899,7 +899,7 @@
 #if DEBUG_DOWNLOAD
   EncName enc;
 
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(query,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1062,7 +1062,7 @@
   }
 
 #if DEBUG_DOWNLOAD
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(&entry->node->chk.query,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1105,7 +1105,7 @@
   if ( (0 == (entry->tries % MAX_TRIES)) &&
        (entry->tries > 0) )  {
     EncName enc;
-    IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
+    IF_GELOG(ectx, GE_WARNING | GE_BULK | GE_USER,
          hash2enc(&entry->node->chk.key,
                   &enc));
     GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,

Modified: GNUnet/src/applications/fs/ecrs/keyspace.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/keyspace.c  2006-07-31 03:29:21 UTC (rev 
3192)
+++ GNUnet/src/applications/fs/ecrs/keyspace.c  2006-07-31 03:36:25 UTC (rev 
3193)
@@ -72,7 +72,7 @@
   if (size < sizeof(KBlock))
     return SYSERR;
   kb = (KBlock*) &value[1];
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(key,
                 &enc));
   ECRS_decryptInPlace(key,
@@ -211,7 +211,7 @@
         strlen(keywords[i]),
         &key);
 #if DEBUG_KEYSPACE
-    IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+    IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
          hash2enc(&key,
                   &enc));
     GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,

Modified: GNUnet/src/applications/fs/ecrs/search.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/search.c    2006-07-31 03:29:21 UTC (rev 
3192)
+++ GNUnet/src/applications/fs/ecrs/search.c    2006-07-31 03:36:25 UTC (rev 
3193)
@@ -360,7 +360,7 @@
        kb = MALLOC(size);
        memcpy(kb, &value[1], size);
 #if DEBUG_SEARCH
-       IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+       IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
              hash2enc(&ps->decryptKey,
                       &enc));
        GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,

Modified: GNUnet/src/applications/fs/ecrs/upload.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/upload.c    2006-07-31 03:29:21 UTC (rev 
3192)
+++ GNUnet/src/applications/fs/ecrs/upload.c    2006-07-31 03:36:25 UTC (rev 
3193)
@@ -74,7 +74,7 @@
                       size,
                       &ichk.query);
 #if DEBUG_UPLOAD
-    IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+    IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
           hash2enc(&ichk.query,
                    &enc));
     GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -98,7 +98,7 @@
     }
     value->prio = htonl(prio);
 #if DEBUG_UPLOAD
-    IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+    IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
           hash2enc(&ichk.query,
                    &enc));
     GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -290,7 +290,7 @@
                       size + sizeof(DBlock),
                       &chk.query);
 #if DEBUG_UPLOAD
-    IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+    IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
           hash2enc(&chk.query,
                    &enc));
     GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -369,7 +369,7 @@
                       size,
                       &chk.query);
 #if DEBUG_UPLOAD
-    IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+    IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
           hash2enc(&chk.query,
                    &enc));
     GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -402,7 +402,7 @@
     iblocks[i] = NULL;
   }
 #if DEBUG_UPLOAD
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
         hash2enc(&chk.query,
                  &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,

Modified: GNUnet/src/applications/fs/lib/fslib.c
===================================================================
--- GNUnet/src/applications/fs/lib/fslib.c      2006-07-31 03:29:21 UTC (rev 
3192)
+++ GNUnet/src/applications/fs/lib/fslib.c      2006-07-31 03:36:25 UTC (rev 
3193)
@@ -226,7 +226,7 @@
   ctx->handles[ctx->handleCount++] = ret;
   MUTEX_UNLOCK(ctx->lock);
 #if DEBUG_FSLIB
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(&req->query[0],
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,

Modified: GNUnet/src/applications/fs/module/fs.c
===================================================================
--- GNUnet/src/applications/fs/module/fs.c      2006-07-31 03:29:21 UTC (rev 
3192)
+++ GNUnet/src/applications/fs/module/fs.c      2006-07-31 03:36:25 UTC (rev 
3193)
@@ -188,7 +188,7 @@
   }
   processResponse(query, dv);
 #if DEBUG_FS
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(query,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -210,7 +210,7 @@
 #if DEBUG_FS
   EncName enc;
 
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(query,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -252,7 +252,7 @@
   }
   rs = (CS_fs_request_search_MESSAGE*) req;
 #if DEBUG_FS
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(&rs->query[0],
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -308,7 +308,7 @@
   type = getTypeOfBlock(ntohs(ri->header.size) - 
sizeof(CS_fs_request_insert_MESSAGE),
                        (const DBlock*) &ri[1]);
 #if DEBUG_FS
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(&query,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -511,7 +511,7 @@
     return SYSERR;
   }
 #if DEBUG_FS
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(&query,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -632,7 +632,7 @@
   EncName enc;
 
 #if DEBUG_FS
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(key,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -656,7 +656,7 @@
                          ggc->keyCount,
                          ggc->keys);
   if (ret == SYSERR) {
-    IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
+    IF_GELOG(ectx, GE_WARNING | GE_BULK | GE_USER,
          hash2enc(key,
                   &enc));
     GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
@@ -666,7 +666,7 @@
     return SYSERR; /* no query will ever match */
   }
   if (ret == NO) {
-    IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
+    IF_GELOG(ectx, GE_WARNING | GE_BULK | GE_USER,
          hash2enc(key,
                   &enc));
     GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
@@ -689,7 +689,7 @@
        refuse to hand out data that requires
        anonymity! */
     FREENONNULL(xvalue);
-    IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
+    IF_GELOG(ectx, GE_WARNING | GE_BULK | GE_USER,
          hash2enc(key,
                   &enc));
     GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
@@ -745,7 +745,7 @@
 #if DEBUG_FS
   EncName enc;
 
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(&keys[0],
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -906,7 +906,7 @@
   GGC myClosure;
   EncName enc;
 
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(&keys[0],
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1087,7 +1087,7 @@
   }
   rs = (const CS_fs_request_search_MESSAGE*) req;
 #if DEBUG_FS 
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(&rs->query[0],
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,

Modified: GNUnet/src/applications/fs/module/ondemand.c
===================================================================
--- GNUnet/src/applications/fs/module/ondemand.c        2006-07-31 03:29:21 UTC 
(rev 3192)
+++ GNUnet/src/applications/fs/module/ondemand.c        2006-07-31 03:36:25 UTC 
(rev 3193)
@@ -245,7 +245,7 @@
 #endif
 
 #if DEBUG_ONDEMAND
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(&key, &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
       "Storing on-demand content for query `%s'\n",
@@ -610,7 +610,7 @@
     else /* not found */
       ret = SYSERR;
     if (ret == SYSERR) {
-      IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
+      IF_GELOG(ectx, GE_WARNING | GE_BULK | GE_USER,
            hash2enc(&key,
                     &enc));
       GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,

Modified: GNUnet/src/applications/fs/module/querymanager.c
===================================================================
--- GNUnet/src/applications/fs/module/querymanager.c    2006-07-31 03:29:21 UTC 
(rev 3192)
+++ GNUnet/src/applications/fs/module/querymanager.c    2006-07-31 03:36:25 UTC 
(rev 3193)
@@ -145,7 +145,7 @@
   GE_ASSERT(ectx, ntohl(value->size) > sizeof(Datastore_Value));
   matchCount = 0;
 #if DEBUG_QUERYMANAGER
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(key,
                 &enc));
 #endif

Modified: GNUnet/src/applications/gap/gap.c
===================================================================
--- GNUnet/src/applications/gap/gap.c   2006-07-31 03:29:21 UTC (rev 3192)
+++ GNUnet/src/applications/gap/gap.c   2006-07-31 03:36:25 UTC (rev 3193)
@@ -529,7 +529,7 @@
 
   if (getBit(qr, getIndex(id)) == 1) {
 #if DEBUG_GAP
-    IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+    IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
          hash2enc(&peer->hashPubKey,
                   &encp);
          hash2enc(&qr->msg->queries[0],
@@ -770,7 +770,7 @@
 #if DEBUG_GAP
   EncName enc;
 
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(primaryKey,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -890,7 +890,7 @@
 #if DEBUG__GAP
   EncName enc;
 
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(query,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1281,7 +1281,7 @@
     resolve_pid(ite->destination[j],
                &recv);
 #if DEBUG_GAP
-    IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+    IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
          hash2enc(&recv.hashPubKey,
                   &enc));
     GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1441,7 +1441,7 @@
     doForward = NO;
 
 #if DEBUG_GAP
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
         hash2enc(&query->queries[0],
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1556,7 +1556,7 @@
 #if DEBUG_GAP
   EncName enc;
 
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        if (host != NULL)
          hash2enc(&host->hashPubKey,
                   &enc));
@@ -1609,7 +1609,7 @@
   if (ret == SYSERR) {
     EncName enc;
     
-    IFGE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
+    IF_GELOG(ectx, GE_ERROR | GE_BULK | GE_USER,
          if (host != NULL)
            hash2enc(&host->hashPubKey, 
                     &enc));
@@ -1930,7 +1930,7 @@
         (getNetworkLoadUp() >= hardUpLimit) ) ) {
 #if DEBUG_GAP
     if (sender != NULL) {
-      IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+      IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
            hash2enc(&sender->hashPubKey,
                     &enc));
     }
@@ -1983,7 +1983,7 @@
   policy = evaluateQuery(sender,
                         &prio);
 #if DEBUG_GAP
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(&qmsg->queries[0],
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1996,7 +1996,7 @@
     FREE(qmsg);
 #if DEBUG_GAP
     if (sender != NULL) {
-      IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+      IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
            hash2enc(&sender->hashPubKey,
                     &enc));
     }

Modified: GNUnet/src/applications/identity/identity.c
===================================================================
--- GNUnet/src/applications/identity/identity.c 2006-07-31 03:29:21 UTC (rev 
3192)
+++ GNUnet/src/applications/identity/identity.c 2006-07-31 03:36:25 UTC (rev 
3193)
@@ -871,7 +871,7 @@
     return SYSERR;
   }
 #if DEBUG_IDENTITY
-  IFGE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
        hash2enc(&identity->hashPubKey,
                 &enc));
   GE_LOG(ectx,

Modified: GNUnet/src/applications/sqstore_mysql/mysql.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysql.c       2006-07-31 03:29:21 UTC 
(rev 3192)
+++ GNUnet/src/applications/sqstore_mysql/mysql.c       2006-07-31 03:36:25 UTC 
(rev 3193)
@@ -694,7 +694,7 @@
     return iterateLowPriority(type, iter, closure);
 
 #if DEBUG_MYSQL
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(query,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -844,7 +844,7 @@
   MUTEX_UNLOCK(&dbh->DATABASE_Lock_);
 
 #if DEBUG_MYSQL
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(query,
                 &enc));
   if (count > 0) {
@@ -898,7 +898,7 @@
   expiration = ntohll(value->expirationTime);
 
 #if DEBUG_MYSQL
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(key,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -962,7 +962,7 @@
 #if DEBUG_MYSQL
   EncName enc;
 
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(key,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,

Modified: GNUnet/src/applications/sqstore_sqlite/sqlite.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlite.c     2006-07-31 03:29:21 UTC 
(rev 3192)
+++ GNUnet/src/applications/sqstore_sqlite/sqlite.c     2006-07-31 03:36:25 UTC 
(rev 3193)
@@ -657,7 +657,7 @@
 
 #if DEBUG_SQLITE
   EncName enc;
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(key,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -772,7 +772,7 @@
 #if DEBUG_SQLITE
   EncName enc;
 
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(key,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -852,7 +852,7 @@
 #if DEBUG_SQLITE
   EncName enc;
 
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(key,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
@@ -967,7 +967,7 @@
 #if DEBUG_SQLITE
   EncName enc;
 
-  IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+  IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
        hash2enc(key,
                 &enc));
   GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,

Modified: GNUnet/src/transports/http.c
===================================================================
--- GNUnet/src/transports/http.c        2006-07-31 03:29:21 UTC (rev 3192)
+++ GNUnet/src/transports/http.c        2006-07-31 03:36:25 UTC (rev 3193)
@@ -605,7 +605,7 @@
     httpSession->expectingWelcome = NO;
     httpSession->sender = welcome->clientIdentity;
 #if DEBUG_HTTP
-    IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
+    IF_GELOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
          hash2enc(&httpSession->sender.hashPubKey,
                   &enc));
     GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,





reply via email to

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