aboutsummaryrefslogtreecommitdiff
path: root/editors/sed.c
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-06-04 10:16:52 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-06-04 10:16:52 +0000
commit74324c86663f57a19c1de303ee8c8e5449db9ef2 (patch)
tree11f5da9de4212875ce5811be2e1050e076378c9a /editors/sed.c
parent4e5f82c76f08614d0b69f9ec4a8baac303af15f6 (diff)
downloadbusybox-74324c86663f57a19c1de303ee8c8e5449db9ef2.tar.gz
busybox-74324c86663f57a19c1de303ee8c8e5449db9ef2.tar.bz2
Audit bb_common_bufsiz usage, add script which looks for misuse.
tr: stop using globals needlessly. code: -103 bytes
Diffstat (limited to 'editors/sed.c')
-rw-r--r--editors/sed.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/editors/sed.c b/editors/sed.c
index d49627ff4..d0c2ca742 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -118,8 +118,14 @@ struct globals {
int len; /* Space allocated */
} pipeline;
};
-
#define G (*(struct globals*)&bb_common_bufsiz1)
+void BUG_sed_globals_too_big(void);
+#define INIT_G() do { \
+ if (sizeof(struct globals) > COMMON_BUFSIZE) \
+ BUG_sed_globals_too_big(); \
+ G.sed_cmd_tail = &G.sed_cmd_head; \
+} while (0)
+
#if ENABLE_FEATURE_CLEAN_UP
static void sed_free_and_close_stuff(void)
@@ -1210,8 +1216,6 @@ static void add_cmd_block(char *cmdstr)
free(sv);
}
-void BUG_sed_globals_too_big(void);
-
int sed_main(int argc, char **argv);
int sed_main(int argc, char **argv)
{
@@ -1222,10 +1226,7 @@ int sed_main(int argc, char **argv)
llist_t *opt_e, *opt_f;
int status = EXIT_SUCCESS;
- if (sizeof(struct globals) > sizeof(bb_common_bufsiz1))
- BUG_sed_globals_too_big();
-
- G.sed_cmd_tail = &G.sed_cmd_head;
+ INIT_G();
/* destroy command strings on exit */
if (ENABLE_FEATURE_CLEAN_UP) atexit(sed_free_and_close_stuff);