From c33a7fef45ad744fec816366c531a2dd70938b2b Mon Sep 17 00:00:00 2001 From: Leandro Lucarella Date: Wed, 28 Jul 2010 16:36:16 -0300 Subject: [PATCH] stats: Refactor code to avoid duplication --- rt/gc/cdgc/opts.d | 48 ++++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/rt/gc/cdgc/opts.d b/rt/gc/cdgc/opts.d index 6e93622..31114f3 100644 --- a/rt/gc/cdgc/opts.d +++ b/rt/gc/cdgc/opts.d @@ -56,38 +56,34 @@ struct Options package Options options; +bool cstr_eq(char* s1, char* s2) +{ + return cstring.strcmp(s1, s2) == 0; +} + + +bool parse_bool(char* value) +{ + if (value[0] == '\0') + return true; + return (cstdlib.atoi(value) != 0); +} + + void process_option(char* opt_name, char* opt_value) { - if (cstring.strcmp(opt_name, "verbose") == 0) - { + if (cstr_eq(opt_name, "verbose")) options.verbose = cstdlib.atoi(opt_value); - } - else if (cstring.strcmp(opt_name, "log_file") == 0) - { + else if (cstr_eq(opt_name, "log_file")) cstring.strcpy(options.log_file.ptr, opt_value); - } - else if (cstring.strcmp(opt_name, "malloc_stats_file") == 0) - { + else if (cstr_eq(opt_name, "malloc_stats_file")) cstring.strcpy(options.malloc_stats_file.ptr, opt_value); - } - else if (cstring.strcmp(opt_name, "collect_stats_file") == 0) - { + else if (cstr_eq(opt_name, "collect_stats_file")) cstring.strcpy(options.collect_stats_file.ptr, opt_value); - } - else if (cstring.strcmp(opt_name, "sentinel") == 0) - { - if (opt_value[0] == '\0') - options.sentinel = true; - else - options.sentinel = (cstdlib.atoi(opt_value) != 0); - } - else if (cstring.strcmp(opt_name, "mem_stomp") == 0) - { - if (opt_value[0] == '\0') - options.mem_stomp = true; - else - options.mem_stomp = (cstdlib.atoi(opt_value) != 0); - } + else if (cstr_eq(opt_name, "sentinel")) + options.sentinel = parse_bool(opt_value); + else if (cstr_eq(opt_name, "mem_stomp")) + options.mem_stomp = parse_bool(opt_value); } -- 2.43.0