A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
With optimizations, gcc 4.6 warns about clobbered variables
[simgrid.git]
/
src
/
xbt
/
config.c
diff --git
a/src/xbt/config.c
b/src/xbt/config.c
index
4aa81d7
..
13df108
100644
(file)
--- a/
src/xbt/config.c
+++ b/
src/xbt/config.c
@@
-515,7
+515,8
@@
void xbt_cfg_set_vargs(xbt_cfg_t cfg, const char *name, va_list pa)
TRY {
type = xbt_cfg_get_type(cfg, name);
TRY {
type = xbt_cfg_get_type(cfg, name);
- } CATCH(e) {
+ }
+ CATCH(e) {
if (e.category == not_found_error) {
xbt_ex_free(e);
THROWF(not_found_error, 0,
if (e.category == not_found_error) {
xbt_ex_free(e);
THROWF(not_found_error, 0,
@@
-588,7
+589,7
@@
void xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options)
double d;
char *str;
double d;
char *str;
- xbt_cfgelm_t variable = NULL;
+
volatile
xbt_cfgelm_t variable = NULL;
char *optionlist_cpy;
char *option, *name, *val;
char *optionlist_cpy;
char *option, *name, *val;
@@
-719,7
+720,7
@@
void xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options)
name);
}
}
name);
}
}
- CATCH
(e)
{
+ CATCH
_ANONYMOUS
{
free(optionlist_cpy);
RETHROW;
}
free(optionlist_cpy);
RETHROW;
}
@@
-1132,7
+1133,8
@@
void xbt_cfg_empty(xbt_cfg_t cfg, const char *name)
TRY {
variable = xbt_dict_get((xbt_dict_t) cfg, name);
TRY {
variable = xbt_dict_get((xbt_dict_t) cfg, name);
- } CATCH(e) {
+ }
+ CATCH(e) {
if (e.category != not_found_error)
RETHROW;
if (e.category != not_found_error)
RETHROW;
@@
-1293,7
+1295,8
@@
xbt_dynar_t xbt_cfg_get_dynar(xbt_cfg_t cfg, const char *name)
TRY {
variable = xbt_dict_get((xbt_dict_t) cfg, name);
TRY {
variable = xbt_dict_get((xbt_dict_t) cfg, name);
- } CATCH(e) {
+ }
+ CATCH(e) {
if (e.category == not_found_error) {
xbt_ex_free(e);
THROWF(not_found_error, 0,
if (e.category == not_found_error) {
xbt_ex_free(e);
THROWF(not_found_error, 0,
@@
-1472,7
+1475,8
@@
XBT_TEST_UNIT("use", test_config_use, "Data retrieving tests")
TRY {
xbt_cfg_set_parse(myset, "color:blue");
TRY {
xbt_cfg_set_parse(myset, "color:blue");
- } CATCH(e) {
+ }
+ CATCH(e) {
if (e.category != not_found_error)
xbt_test_exception(e);
xbt_ex_free(e);
if (e.category != not_found_error)
xbt_test_exception(e);
xbt_ex_free(e);