aboutsummaryrefslogtreecommitdiff
path: root/src/fs/test_fs.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2010-11-03 21:26:40 +0000
committerChristian Grothoff <christian@grothoff.org>2010-11-03 21:26:40 +0000
commit721e49caeea6ba5073f8bc5c6c08359295c02bb5 (patch)
treee06e80ba90af91e9452a48a7a5782913199b4877 /src/fs/test_fs.c
parent37ac1b7c9e9e05f93d4100cfb53450ec2d370989 (diff)
downloadgnunet-721e49caeea6ba5073f8bc5c6c08359295c02bb5.tar.gz
gnunet-721e49caeea6ba5073f8bc5c6c08359295c02bb5.zip
original patch from Mantis 1614
Diffstat (limited to 'src/fs/test_fs.c')
-rw-r--r--src/fs/test_fs.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/fs/test_fs.c b/src/fs/test_fs.c
index f9621949e..a97faf94f 100644
--- a/src/fs/test_fs.c
+++ b/src/fs/test_fs.c
@@ -104,7 +104,7 @@ int
104main (int argc, char *argv[]) 104main (int argc, char *argv[])
105{ 105{
106#if START_DAEMON 106#if START_DAEMON
107 pid_t daemon; 107 GNUNET_OS_Process *daemon;
108#endif 108#endif
109 int ok; 109 int ok;
110 struct GNUNET_ECRS_URI *uri; 110 struct GNUNET_ECRS_URI *uri;
@@ -132,7 +132,7 @@ main (int argc, char *argv[])
132 } 132 }
133#if START_DAEMON 133#if START_DAEMON
134 daemon = GNUNET_daemon_start (NULL, cfg, "peer.conf", GNUNET_NO); 134 daemon = GNUNET_daemon_start (NULL, cfg, "peer.conf", GNUNET_NO);
135 GNUNET_GE_ASSERT (NULL, daemon > 0); 135 GNUNET_GE_ASSERT (NULL, daemon != NULL);
136 CHECK (GNUNET_OK == 136 CHECK (GNUNET_OK ==
137 GNUNET_wait_for_daemon_running (NULL, cfg, 137 GNUNET_wait_for_daemon_running (NULL, cfg,
138 60 * GNUNET_CRON_SECONDS)); 138 60 * GNUNET_CRON_SECONDS));
@@ -250,6 +250,7 @@ FAILURE:
250 250
251#if START_DAEMON 251#if START_DAEMON
252 GNUNET_GE_ASSERT (NULL, GNUNET_OK == GNUNET_daemon_stop (NULL, daemon)); 252 GNUNET_GE_ASSERT (NULL, GNUNET_OK == GNUNET_daemon_stop (NULL, daemon));
253 GNUNET_OS_process_close (daemon);
253#endif 254#endif
254 GNUNET_GC_free (cfg); 255 GNUNET_GC_free (cfg);
255 256