From 47114d639e407629319f373ebbd6dabe0842a4e1 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 26 Mar 2012 18:19:26 +0200 Subject: [PATCH 1/1] Revert "This commit breaks the simgrid-java execution; Revert "Avoid unnecessary loop."" The java bindings should be ok now. This reverts commit 599347b970dec2ad471021b8eecca62e8f0854e9. --- src/xbt/log.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/xbt/log.c b/src/xbt/log.c index 23c908ba4a..0e78015267 100644 --- a/src/xbt/log.c +++ b/src/xbt/log.c @@ -547,7 +547,7 @@ void xbt_log_init(int *argc, char **argv) // _XBT_LOGV(log).threshold = xbt_log_priority_debug; /* uncomment to set the LOG category to debug directly */ /* Set logs and init log submodule */ - for (i = 1; i < *argc; i++) { + for (j = i = 1; i < *argc; i++) { if (!strncmp(argv[i], "--log=", strlen("--log=")) || !strncmp(argv[i], "--gras-log=", strlen("--gras-log=")) || !strncmp(argv[i], "--surf-log=", strlen("--surf-log=")) || @@ -564,17 +564,12 @@ void xbt_log_init(int *argc, char **argv) opt++; xbt_log_control_set(opt); XBT_DEBUG("Did apply '%s' as log setting", opt); - /*remove this from argv */ - - for (j = i + 1; j < *argc; j++) { - argv[j - 1] = argv[j]; - } - - argv[j - 1] = NULL; - (*argc)--; - i--; /* compensate effect of next loop incrementation */ + } else { + argv[j++] = argv[i]; } } + argv[j] = NULL; + *argc = j; } static void log_cat_exit(xbt_log_category_t cat) -- 2.20.1