diff options
Diffstat (limited to 'src/testing/testing.c')
-rw-r--r-- | src/testing/testing.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/testing/testing.c b/src/testing/testing.c index 23bc40d7e..0ca4c3063 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c | |||
@@ -473,8 +473,8 @@ cleanup_shared_service_instance (struct SharedServiceInstance *i) | |||
473 | (void) unlink (i->cfg_fn); | 473 | (void) unlink (i->cfg_fn); |
474 | GNUNET_free (i->cfg_fn); | 474 | GNUNET_free (i->cfg_fn); |
475 | } | 475 | } |
476 | GNUNET_free_non_null (i->unix_sock); | 476 | GNUNET_free (i->unix_sock); |
477 | GNUNET_free_non_null (i->port_str); | 477 | GNUNET_free (i->port_str); |
478 | GNUNET_break (NULL == i->proc); | 478 | GNUNET_break (NULL == i->proc); |
479 | GNUNET_break (0 == i->n_refs); | 479 | GNUNET_break (0 == i->n_refs); |
480 | GNUNET_free (i); | 480 | GNUNET_free (i); |
@@ -551,17 +551,17 @@ GNUNET_TESTING_system_destroy (struct GNUNET_TESTING_System *system, | |||
551 | stop_shared_service_instance (i); | 551 | stop_shared_service_instance (i); |
552 | cleanup_shared_service_instance (i); | 552 | cleanup_shared_service_instance (i); |
553 | } | 553 | } |
554 | GNUNET_free_non_null (ss->instances); | 554 | GNUNET_free (ss->instances); |
555 | GNUNET_CONFIGURATION_destroy (ss->cfg); | 555 | GNUNET_CONFIGURATION_destroy (ss->cfg); |
556 | GNUNET_free (ss->sname); | 556 | GNUNET_free (ss->sname); |
557 | GNUNET_free (ss); | 557 | GNUNET_free (ss); |
558 | } | 558 | } |
559 | GNUNET_free_non_null (system->shared_services); | 559 | GNUNET_free (system->shared_services); |
560 | if (GNUNET_YES == remove_paths) | 560 | if (GNUNET_YES == remove_paths) |
561 | GNUNET_DISK_directory_remove (system->tmppath); | 561 | GNUNET_DISK_directory_remove (system->tmppath); |
562 | GNUNET_free (system->tmppath); | 562 | GNUNET_free (system->tmppath); |
563 | GNUNET_free_non_null (system->trusted_ip); | 563 | GNUNET_free (system->trusted_ip); |
564 | GNUNET_free_non_null (system->hostname); | 564 | GNUNET_free (system->hostname); |
565 | GNUNET_free (system); | 565 | GNUNET_free (system); |
566 | } | 566 | } |
567 | 567 | ||
@@ -957,7 +957,7 @@ update_config_sections (void *cls, const char *section) | |||
957 | } | 957 | } |
958 | GNUNET_free (ikeys); | 958 | GNUNET_free (ikeys); |
959 | } | 959 | } |
960 | GNUNET_free_non_null (val); | 960 | GNUNET_free (val); |
961 | ACCEPT_FROM_key = "ACCEPT_FROM"; | 961 | ACCEPT_FROM_key = "ACCEPT_FROM"; |
962 | if ((NULL != uc->system->trusted_ip) && | 962 | if ((NULL != uc->system->trusted_ip) && |
963 | (NULL != strstr (uc->system->trusted_ip, ":"))) /* IPv6 in use */ | 963 | (NULL != strstr (uc->system->trusted_ip, ":"))) /* IPv6 in use */ |
@@ -1120,7 +1120,7 @@ GNUNET_TESTING_configuration_create_ (struct GNUNET_TESTING_System *system, | |||
1120 | *nports = uc.nports; | 1120 | *nports = uc.nports; |
1121 | } | 1121 | } |
1122 | else | 1122 | else |
1123 | GNUNET_free_non_null (uc.ports); | 1123 | GNUNET_free (uc.ports); |
1124 | return uc.status; | 1124 | return uc.status; |
1125 | } | 1125 | } |
1126 | 1126 | ||
@@ -1316,8 +1316,8 @@ GNUNET_TESTING_peer_configure (struct GNUNET_TESTING_System *system, | |||
1316 | return peer; | 1316 | return peer; |
1317 | 1317 | ||
1318 | err_ret: | 1318 | err_ret: |
1319 | GNUNET_free_non_null (ss_instances); | 1319 | GNUNET_free (ss_instances); |
1320 | GNUNET_free_non_null (ports); | 1320 | GNUNET_free (ports); |
1321 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s", emsg_); | 1321 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s", emsg_); |
1322 | if (NULL != emsg) | 1322 | if (NULL != emsg) |
1323 | *emsg = emsg_; | 1323 | *emsg = emsg_; |
@@ -1566,8 +1566,8 @@ GNUNET_TESTING_peer_destroy (struct GNUNET_TESTING_Peer *peer) | |||
1566 | GNUNET_CONFIGURATION_destroy (peer->cfg); | 1566 | GNUNET_CONFIGURATION_destroy (peer->cfg); |
1567 | GNUNET_free (peer->main_binary); | 1567 | GNUNET_free (peer->main_binary); |
1568 | GNUNET_free (peer->args); | 1568 | GNUNET_free (peer->args); |
1569 | GNUNET_free_non_null (peer->id); | 1569 | GNUNET_free (peer->id); |
1570 | GNUNET_free_non_null (peer->ss_instances); | 1570 | GNUNET_free (peer->ss_instances); |
1571 | if (NULL != peer->ports) | 1571 | if (NULL != peer->ports) |
1572 | { | 1572 | { |
1573 | for (cnt = 0; cnt < peer->nports; cnt++) | 1573 | for (cnt = 0; cnt < peer->nports; cnt++) |