[GNUnet-SVN] r9364 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2009-10-31 15:18:45 -0600 (Sat, 31 Oct 2009)
New Revision: 9364

Modified:
   gnunet/src/util/network.c
   gnunet/src/util/server.c
   gnunet/src/util/service.c
   gnunet/src/util/test_bio.c
Log:
remove temp files, indentation

Modified: gnunet/src/util/network.c
===================================================================
--- gnunet/src/util/network.c   2009-10-31 20:47:12 UTC (rev 9363)
+++ gnunet/src/util/network.c   2009-10-31 21:18:45 UTC (rev 9364)
@@ -29,7 +29,7 @@
 #include "disk.h"
 #include "gnunet_container_lib.h"
 
-#define DEBUG_NETWORK GNUNET_YES
+#define DEBUG_NETWORK GNUNET_NO
 
 #ifndef INVALID_SOCKET
 #define INVALID_SOCKET -1

Modified: gnunet/src/util/server.c
===================================================================
--- gnunet/src/util/server.c    2009-10-31 20:47:12 UTC (rev 9363)
+++ gnunet/src/util/server.c    2009-10-31 21:18:45 UTC (rev 9364)
@@ -35,7 +35,7 @@
 #include "gnunet_time_lib.h"
 #include "gnunet_disk_lib.h"
 
-#define DEBUG_SERVER GNUNET_YES
+#define DEBUG_SERVER GNUNET_NO
 
 /**
  * List of arrays of message handlers.

Modified: gnunet/src/util/service.c
===================================================================
--- gnunet/src/util/service.c   2009-10-31 20:47:12 UTC (rev 9363)
+++ gnunet/src/util/service.c   2009-10-31 21:18:45 UTC (rev 9364)
@@ -1335,7 +1335,12 @@
       GNUNET_free_non_null (sctx.v6_allowed);
       return GNUNET_SYSERR;
     }
-
+#if 0
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Service `%s' runs with configuration from `%s'\n",
+             serviceName,
+             cfg_fn);
+#endif
   /* actually run service */
   GNUNET_SCHEDULER_run (&service_task, &sctx);
   if (sctx.ready_confirm_fd != -1)

Modified: gnunet/src/util/test_bio.c
===================================================================
--- gnunet/src/util/test_bio.c  2009-10-31 20:47:12 UTC (rev 9363)
+++ gnunet/src/util/test_bio.c  2009-10-31 21:18:45 UTC (rev 9364)
@@ -23,48 +23,46 @@
  * @brief testcase for the buffered IO module
  * @author Ji Lu
  */
-
-
 #include "platform.h"
 #include "gnunet_util_lib.h"
+
 #define TESTSTRING "testString"
 #define TESTNUMBER64 100000L
 
 int
 main (int argc, char *argv[])
 {
-
-    char *readResultString;
-       int64_t testNumber = (int64_t)TESTNUMBER64;
-       int64_t testNum;
-       char *msg;
-
-       char* fileName = GNUNET_DISK_mktemp ("gnunet_bio");
-       struct GNUNET_BIO_ReadHandle *fileR;
-       struct GNUNET_BIO_WriteHandle *fileW;
-       struct GNUNET_CONTAINER_MetaData *metaDataW;
-       struct GNUNET_CONTAINER_MetaData *metaDataR;
-
-       metaDataR = GNUNET_CONTAINER_meta_data_create();
-       metaDataW = GNUNET_CONTAINER_meta_data_create();
-       GNUNET_CONTAINER_meta_data_add_publication_date(metaDataW);
-       fileW = GNUNET_BIO_write_open(fileName);
-    GNUNET_assert(NULL!=fileW);
-       GNUNET_assert(GNUNET_OK == GNUNET_BIO_write_string(fileW, TESTSTRING));
-       GNUNET_assert(GNUNET_OK == GNUNET_BIO_write_meta_data(fileW,metaDataW));
-       GNUNET_assert(GNUNET_OK == GNUNET_BIO_write_int64(fileW,testNumber));
-       GNUNET_assert(GNUNET_OK == GNUNET_BIO_write_close(fileW));
-       fileR = GNUNET_BIO_read_open (fileName);
-    GNUNET_assert(NULL!=fileR);
-       GNUNET_assert(GNUNET_OK == GNUNET_BIO_read_string(fileR, "Read string 
error", &readResultString, 200));
-       GNUNET_BIO_read_meta_data(fileR, "Read meta error", &metaDataR);
-       GNUNET_assert(GNUNET_YES == 
GNUNET_CONTAINER_meta_data_test_equal(metaDataR,metaDataW));
-       GNUNET_assert(GNUNET_OK == GNUNET_BIO_read_int64(fileR, &testNum));
-       GNUNET_BIO_read_close(fileR,&msg);
-       GNUNET_CONTAINER_meta_data_destroy(metaDataW);
-       GNUNET_CONTAINER_meta_data_destroy(metaDataR);
-    free(fileName);
-
-    return 0;
-
+  char *readResultString;
+  int64_t testNumber = (int64_t)TESTNUMBER64;
+  int64_t testNum;
+  char *msg;
+  char* fileName;
+  struct GNUNET_BIO_ReadHandle *fileR;
+  struct GNUNET_BIO_WriteHandle *fileW;
+  struct GNUNET_CONTAINER_MetaData *metaDataW;
+  struct GNUNET_CONTAINER_MetaData *metaDataR;
+  
+  filename = GNUNET_DISK_mktemp ("gnunet_bio");
+  metaDataR = GNUNET_CONTAINER_meta_data_create();
+  metaDataW = GNUNET_CONTAINER_meta_data_create();
+  GNUNET_CONTAINER_meta_data_add_publication_date(metaDataW);
+  fileW = GNUNET_BIO_write_open(fileName);
+  GNUNET_assert(NULL!=fileW);
+  GNUNET_assert(GNUNET_OK == GNUNET_BIO_write_string(fileW, TESTSTRING));
+  GNUNET_assert(GNUNET_OK == GNUNET_BIO_write_meta_data(fileW,metaDataW));
+  GNUNET_assert(GNUNET_OK == GNUNET_BIO_write_int64(fileW,testNumber));
+  GNUNET_assert(GNUNET_OK == GNUNET_BIO_write_close(fileW));
+  fileR = GNUNET_BIO_read_open (fileName);
+  GNUNET_assert(NULL!=fileR);
+  GNUNET_assert(GNUNET_OK == GNUNET_BIO_read_string(fileR, "Read string 
error", &readResultString, 200));
+  GNUNET_BIO_read_meta_data(fileR, "Read meta error", &metaDataR);
+  GNUNET_assert(GNUNET_YES == 
GNUNET_CONTAINER_meta_data_test_equal(metaDataR,metaDataW));
+  GNUNET_assert(GNUNET_OK == GNUNET_BIO_read_int64(fileR, &testNum));
+  GNUNET_BIO_read_close(fileR,&msg);
+  GNUNET_CONTAINER_meta_data_destroy(metaDataW);
+  GNUNET_CONTAINER_meta_data_destroy(metaDataR);
+  GNUNET_DISK_directory_remove (fileName);
+  free(fileName);
+  
+  return 0;
 }                               /* end of main */