From 903f71895fc1cfd7bbc7609c57b9d09153b7011e Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 5 Nov 2013 22:16:40 +0100 Subject: [PATCH 1/1] Simplify logic, and free loc in all cases. --- src/smpi/smpi_bench.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c index 7e69951c1e..d87320eb58 100644 --- a/src/smpi/smpi_bench.c +++ b/src/smpi/smpi_bench.c @@ -496,28 +496,28 @@ void smpi_shared_free(void *ptr) } #endif -int smpi_shared_known_call(const char* func, const char* input) { - char* loc = bprintf("%s:%s", func, input); - xbt_ex_t ex; - int known; +int smpi_shared_known_call(const char* func, const char* input) +{ + char* loc = bprintf("%s:%s", func, input); + xbt_ex_t ex; + int known = 0; - if(!calls) { - calls = xbt_dict_new_homogeneous(NULL); - } - TRY { - xbt_dict_get(calls, loc); /* Succeed or throw */ - known = 1; - } - CATCH(ex) { - if(ex.category == not_found_error) { - known = 0; - xbt_ex_free(ex); - } else { - RETHROW; - } - } - free(loc); - return known; + if (!calls) { + calls = xbt_dict_new_homogeneous(NULL); + } + TRY { + xbt_dict_get(calls, loc); /* Succeed or throw */ + known = 1; + } + TRY_CLEANUP { + xbt_free(loc); + } + CATCH(ex) { + if (ex.category != not_found_error) + RETHROW; + xbt_ex_free(ex); + } + return known; } void* smpi_shared_get_call(const char* func, const char* input) { -- 2.20.1