(no commit message)

[oweals/gnunet.git] / src / transport / test_transport_api.c

diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index 7e08ebd4b64be6e6301d0a55029f7002688c9b29..671e28bfcdf045e9ad600325911be26e6412b444 100644 (file)
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -193,7 +193,7 @@ notify_connect (void *cls,
     {
       GNUNET_SCHEDULER_cancel (sched, die_task);
       die_task = GNUNET_SCHEDULER_add_delayed (sched,
-                                              TIMEOUT_TRANSMIT, 
+                                              TIMEOUT_TRANSMIT,
                                               &end_badly, NULL);
 
       GNUNET_TRANSPORT_notify_transmit_ready (p1.th,
@@ -237,7 +237,7 @@ setup_peer (struct PeerContext *p, const char *cfgname)
                  if (GNUNET_CONFIGURATION_have_value (p->cfg,
                                                                                           "transport-https", "KEY_FILE"))
                                GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "KEY_FILE", &key_file_p1);
-                 else
+                 if (key_file_p1==NULL)
                          GNUNET_asprintf(&key_file_p1,"https.key");
                  if (0 == stat (key_file_p1, &sbuf ))
                  {
@@ -248,7 +248,7 @@ setup_peer (struct PeerContext *p, const char *cfgname)
                  }
                  if (GNUNET_CONFIGURATION_have_value (p->cfg,"transport-https", "CERT_FILE"))
                          GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "CERT_FILE", &cert_file_p1);
-                 else
+                 if (cert_file_p1==NULL)
                          GNUNET_asprintf(&cert_file_p1,"https.cert");
                  if (0 == stat (cert_file_p1, &sbuf ))
                  {
@@ -263,7 +263,7 @@ setup_peer (struct PeerContext *p, const char *cfgname)
                  if (GNUNET_CONFIGURATION_have_value (p->cfg,
                                                                                           "transport-https", "KEY_FILE"))
                                GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "KEY_FILE", &key_file_p2);
-                 else
+                 if (key_file_p2==NULL)
                          GNUNET_asprintf(&key_file_p2,"https.key");
                  if (0 == stat (key_file_p2, &sbuf ))
                  {
@@ -274,7 +274,7 @@ setup_peer (struct PeerContext *p, const char *cfgname)
                  }
                  if (GNUNET_CONFIGURATION_have_value (p->cfg,"transport-https", "CERT_FILE"))
                          GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "CERT_FILE", &cert_file_p2);
-                 else
+                 if (cert_file_p2==NULL)
                          GNUNET_asprintf(&cert_file_p2,"https.cert");
                  if (0 == stat (cert_file_p2, &sbuf ))
                  {
@@ -347,7 +347,7 @@ run (void *cls,
   OKPP;
   sched = s;
   die_task = GNUNET_SCHEDULER_add_delayed (sched,
-                                          TIMEOUT, 
+                                          TIMEOUT,
                                           &end_badly, NULL);
 
   if (is_udp)
@@ -490,7 +490,7 @@ get_path_from_PATH ()
 }
 
 
-static int 
+static int
 check_gnunet_nat_server()
 {
   struct stat statbuf;
@@ -505,8 +505,8 @@ check_gnunet_nat_server()
       return GNUNET_SYSERR;
     }
   GNUNET_free (p);
-  if ( (0 != (statbuf.st_mode & S_ISUID)) && 
-       (statbuf.st_uid == 0) )    
+  if ( (0 != (statbuf.st_mode & S_ISUID)) &&
+       (statbuf.st_uid == 0) )
     return GNUNET_YES;
   return GNUNET_NO;
 }