diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2014-04-07 14:31:45 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2014-04-07 14:31:45 +0000 |
commit | d0f7237565c19a111ad0caf5d1768a518289ac84 (patch) | |
tree | bebfb738705dc751547c90c45fa1c623e9f28ea3 /src/ats/gnunet-ats-solver-eval.c | |
parent | caadc021c3ee667469ffe6d7db0da75a4ff9b77f (diff) | |
download | gnunet-d0f7237565c19a111ad0caf5d1768a518289ac84.tar.gz gnunet-d0f7237565c19a111ad0caf5d1768a518289ac84.zip |
removing unused variable und double free (with null check)
Diffstat (limited to 'src/ats/gnunet-ats-solver-eval.c')
-rw-r--r-- | src/ats/gnunet-ats-solver-eval.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/ats/gnunet-ats-solver-eval.c b/src/ats/gnunet-ats-solver-eval.c index 131781768..412ed47d6 100644 --- a/src/ats/gnunet-ats-solver-eval.c +++ b/src/ats/gnunet-ats-solver-eval.c | |||
@@ -1422,7 +1422,6 @@ load_op_stop_set_property (struct GNUNET_ATS_TEST_Operation *o, | |||
1422 | fprintf (stderr, "Invalid property in operation %u `%s' in episode %u\n", | 1422 | fprintf (stderr, "Invalid property in operation %u `%s' in episode %u\n", |
1423 | op_counter, op_name, e->id); | 1423 | op_counter, op_name, e->id); |
1424 | GNUNET_free (op_name); | 1424 | GNUNET_free (op_name); |
1425 | GNUNET_free (pref); | ||
1426 | GNUNET_free_non_null (pref); | 1425 | GNUNET_free_non_null (pref); |
1427 | return GNUNET_SYSERR; | 1426 | return GNUNET_SYSERR; |
1428 | } | 1427 | } |
@@ -1693,10 +1692,11 @@ enforce_add_address (struct GNUNET_ATS_TEST_Operation *op) | |||
1693 | GNUNET_CONTAINER_DLL_insert (peer_head, peer_tail, p); | 1692 | GNUNET_CONTAINER_DLL_insert (peer_head, peer_tail, p); |
1694 | } | 1693 | } |
1695 | 1694 | ||
1696 | if (NULL != (a = find_address_by_id (p, op->address_id))) | 1695 | if (NULL != (find_address_by_id (p, op->address_id))) |
1697 | { | 1696 | { |
1698 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Duplicate address %u for peer %u\n", | 1697 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Duplicate address %u for peer %u\n", |
1699 | op->address_id, op->peer_id); | 1698 | op->address_id, op->peer_id); |
1699 | return; | ||
1700 | } | 1700 | } |
1701 | 1701 | ||
1702 | a = GNUNET_new (struct TestAddress); | 1702 | a = GNUNET_new (struct TestAddress); |
@@ -1721,7 +1721,6 @@ static void | |||
1721 | enforce_del_address (struct GNUNET_ATS_TEST_Operation *op) | 1721 | enforce_del_address (struct GNUNET_ATS_TEST_Operation *op) |
1722 | { | 1722 | { |
1723 | struct TestPeer *p; | 1723 | struct TestPeer *p; |
1724 | struct TestAddress *a; | ||
1725 | struct AddressLookupCtx ctx; | 1724 | struct AddressLookupCtx ctx; |
1726 | 1725 | ||
1727 | if (NULL == (p = find_peer_by_id (op->peer_id))) | 1726 | if (NULL == (p = find_peer_by_id (op->peer_id))) |
@@ -1745,7 +1744,7 @@ enforce_del_address (struct GNUNET_ATS_TEST_Operation *op) | |||
1745 | return; | 1744 | return; |
1746 | } | 1745 | } |
1747 | 1746 | ||
1748 | if (NULL == (a = find_address_by_id (p, op->address_id))) | 1747 | if (NULL == (find_address_by_id (p, op->address_id))) |
1749 | { | 1748 | { |
1750 | GNUNET_break (0); | 1749 | GNUNET_break (0); |
1751 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1750 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
@@ -1816,14 +1815,13 @@ static void | |||
1816 | enforce_start_preference (struct GNUNET_ATS_TEST_Operation *op) | 1815 | enforce_start_preference (struct GNUNET_ATS_TEST_Operation *op) |
1817 | { | 1816 | { |
1818 | struct PreferenceGenerator *pg; | 1817 | struct PreferenceGenerator *pg; |
1819 | struct TestPeer *p; | ||
1820 | if (NULL != (pg = find_pref_gen (op->peer_id, op->address_id, op->pref_type))) | 1818 | if (NULL != (pg = find_pref_gen (op->peer_id, op->address_id, op->pref_type))) |
1821 | { | 1819 | { |
1822 | GNUNET_ATS_solver_generate_preferences_stop (pg); | 1820 | GNUNET_ATS_solver_generate_preferences_stop (pg); |
1823 | GNUNET_free (pg); | 1821 | GNUNET_free (pg); |
1824 | } | 1822 | } |
1825 | 1823 | ||
1826 | if (NULL == (p = find_peer_by_id (op->peer_id))) | 1824 | if (NULL == (find_peer_by_id (op->peer_id))) |
1827 | { | 1825 | { |
1828 | GNUNET_break (0); | 1826 | GNUNET_break (0); |
1829 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1827 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
@@ -2133,7 +2131,8 @@ free_all_it (void *cls, | |||
2133 | void *value) | 2131 | void *value) |
2134 | { | 2132 | { |
2135 | struct ATS_Address *address = value; | 2133 | struct ATS_Address *address = value; |
2136 | GNUNET_CONTAINER_multipeermap_remove (sh->env.addresses, key, value); | 2134 | GNUNET_break (GNUNET_OK != GNUNET_CONTAINER_multipeermap_remove (sh->env.addresses, |
2135 | key, value)); | ||
2137 | GNUNET_free (address); | 2136 | GNUNET_free (address); |
2138 | 2137 | ||
2139 | return GNUNET_OK; | 2138 | return GNUNET_OK; |