diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-01-07 14:39:34 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-01-07 14:39:34 +0100 |
commit | 844a6c5abdcb5a189e91cb7ca3742bcaed25a4da (patch) | |
tree | 8cf5e90d42a9c45fec0e87692d2c170bdf97a549 | |
parent | 9c8e94bc0a3836dd6b8acbcf1fa88283a0a3c148 (diff) | |
download | busybox-w32-844a6c5abdcb5a189e91cb7ca3742bcaed25a4da.tar.gz busybox-w32-844a6c5abdcb5a189e91cb7ca3742bcaed25a4da.tar.bz2 busybox-w32-844a6c5abdcb5a189e91cb7ca3742bcaed25a4da.zip |
awk: code shrink
function old new delta
awk_main 955 948 -7
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | editors/awk.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/editors/awk.c b/editors/awk.c index 8f523ea28..d54249bfd 100644 --- a/editors/awk.c +++ b/editors/awk.c | |||
@@ -3149,7 +3149,7 @@ static rstream *next_input_file(void) | |||
3149 | } | 3149 | } |
3150 | 3150 | ||
3151 | int awk_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 3151 | int awk_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
3152 | int awk_main(int argc, char **argv) | 3152 | int awk_main(int argc UNUSED_PARAM, char **argv) |
3153 | { | 3153 | { |
3154 | unsigned opt; | 3154 | unsigned opt; |
3155 | char *opt_F; | 3155 | char *opt_F; |
@@ -3218,7 +3218,7 @@ int awk_main(int argc, char **argv) | |||
3218 | } | 3218 | } |
3219 | opt = getopt32(argv, OPTSTR_AWK, &opt_F, &list_v, &list_f, IF_FEATURE_AWK_GNU_EXTENSIONS(&list_e,) NULL); | 3219 | opt = getopt32(argv, OPTSTR_AWK, &opt_F, &list_v, &list_f, IF_FEATURE_AWK_GNU_EXTENSIONS(&list_e,) NULL); |
3220 | argv += optind; | 3220 | argv += optind; |
3221 | argc -= optind; | 3221 | //argc -= optind; |
3222 | if (opt & OPT_W) | 3222 | if (opt & OPT_W) |
3223 | bb_error_msg("warning: option -W is ignored"); | 3223 | bb_error_msg("warning: option -W is ignored"); |
3224 | if (opt & OPT_F) { | 3224 | if (opt & OPT_F) { |
@@ -3255,15 +3255,14 @@ int awk_main(int argc, char **argv) | |||
3255 | if (!*argv) | 3255 | if (!*argv) |
3256 | bb_show_usage(); | 3256 | bb_show_usage(); |
3257 | parse_program(*argv++); | 3257 | parse_program(*argv++); |
3258 | argc--; | ||
3259 | } | 3258 | } |
3260 | 3259 | ||
3261 | /* fill in ARGV array */ | 3260 | /* fill in ARGV array */ |
3262 | setvar_i(intvar[ARGC], argc + 1); | ||
3263 | setari_u(intvar[ARGV], 0, "awk"); | 3261 | setari_u(intvar[ARGV], 0, "awk"); |
3264 | i = 0; | 3262 | i = 0; |
3265 | while (*argv) | 3263 | while (*argv) |
3266 | setari_u(intvar[ARGV], ++i, *argv++); | 3264 | setari_u(intvar[ARGV], ++i, *argv++); |
3265 | setvar_i(intvar[ARGC], i + 1); | ||
3267 | 3266 | ||
3268 | evaluate(beginseq.first, &tv); | 3267 | evaluate(beginseq.first, &tv); |
3269 | if (!mainseq.first && !endseq.first) | 3268 | if (!mainseq.first && !endseq.first) |