diff options
| author | Christian Grothoff <christian@grothoff.org> | 2013-03-29 14:33:42 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2013-03-29 14:33:42 +0000 |
| commit | 663cc4e8d6359a3452ee5a907cf6919cc596d5bd (patch) | |
| tree | 43f65c934cdef3853a36d2d80a0d62b1a8226b1d /src | |
| parent | 949f21f03df9f08b0a73c3e47a798e63790edf7f (diff) | |
| download | gnunet-663cc4e8d6359a3452ee5a907cf6919cc596d5bd.tar.gz gnunet-663cc4e8d6359a3452ee5a907cf6919cc596d5bd.zip | |
-fix shutdown order
Diffstat (limited to 'src')
| -rw-r--r-- | src/fs/test_fs_search.c | 10 | ||||
| -rw-r--r-- | src/fs/test_fs_search_persistence.c | 10 | ||||
| -rw-r--r-- | src/fs/test_fs_search_probes.c | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c index a0fba1a9e..186365fdb 100644 --- a/src/fs/test_fs_search.c +++ b/src/fs/test_fs_search.c | |||
| @@ -72,16 +72,16 @@ abort_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
| 72 | { | 72 | { |
| 73 | fprintf (stderr, | 73 | fprintf (stderr, |
| 74 | "Timeout\n"); | 74 | "Timeout\n"); |
| 75 | if (NULL != publish) | ||
| 76 | { | ||
| 77 | GNUNET_FS_publish_stop (publish); | ||
| 78 | publish = NULL; | ||
| 79 | } | ||
| 80 | if (NULL != search) | 75 | if (NULL != search) |
| 81 | { | 76 | { |
| 82 | GNUNET_FS_search_stop (search); | 77 | GNUNET_FS_search_stop (search); |
| 83 | search = NULL; | 78 | search = NULL; |
| 84 | } | 79 | } |
| 80 | if (NULL != publish) | ||
| 81 | { | ||
| 82 | GNUNET_FS_publish_stop (publish); | ||
| 83 | publish = NULL; | ||
| 84 | } | ||
| 85 | err = 1; | 85 | err = 1; |
| 86 | } | 86 | } |
| 87 | 87 | ||
diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c index 4b60192e8..82f77d9e2 100644 --- a/src/fs/test_fs_search_persistence.c +++ b/src/fs/test_fs_search_persistence.c | |||
| @@ -64,16 +64,16 @@ abort_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
| 64 | { | 64 | { |
| 65 | fprintf (stderr, | 65 | fprintf (stderr, |
| 66 | "Timeout\n"); | 66 | "Timeout\n"); |
| 67 | if (NULL != publish) | ||
| 68 | { | ||
| 69 | GNUNET_FS_publish_stop (publish); | ||
| 70 | publish = NULL; | ||
| 71 | } | ||
| 72 | if (NULL != search) | 67 | if (NULL != search) |
| 73 | { | 68 | { |
| 74 | GNUNET_FS_search_stop (search); | 69 | GNUNET_FS_search_stop (search); |
| 75 | search = NULL; | 70 | search = NULL; |
| 76 | } | 71 | } |
| 72 | if (NULL != publish) | ||
| 73 | { | ||
| 74 | GNUNET_FS_publish_stop (publish); | ||
| 75 | publish = NULL; | ||
| 76 | } | ||
| 77 | err = 1; | 77 | err = 1; |
| 78 | } | 78 | } |
| 79 | 79 | ||
diff --git a/src/fs/test_fs_search_probes.c b/src/fs/test_fs_search_probes.c index b2f1e0bf1..442f99cb7 100644 --- a/src/fs/test_fs_search_probes.c +++ b/src/fs/test_fs_search_probes.c | |||
| @@ -63,16 +63,16 @@ abort_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
| 63 | { | 63 | { |
| 64 | fprintf (stderr, | 64 | fprintf (stderr, |
| 65 | "Timeout\n"); | 65 | "Timeout\n"); |
| 66 | if (NULL != publish) | ||
| 67 | { | ||
| 68 | GNUNET_FS_publish_stop (publish); | ||
| 69 | publish = NULL; | ||
| 70 | } | ||
| 71 | if (NULL != search) | 66 | if (NULL != search) |
| 72 | { | 67 | { |
| 73 | GNUNET_FS_search_stop (search); | 68 | GNUNET_FS_search_stop (search); |
| 74 | search = NULL; | 69 | search = NULL; |
| 75 | } | 70 | } |
| 71 | if (NULL != publish) | ||
| 72 | { | ||
| 73 | GNUNET_FS_publish_stop (publish); | ||
| 74 | publish = NULL; | ||
| 75 | } | ||
| 76 | err = 1; | 76 | err = 1; |
| 77 | } | 77 | } |
| 78 | 78 | ||