diff options
author | Rob Landley <rob@landley.net> | 2006-03-10 19:22:06 +0000 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2006-03-10 19:22:06 +0000 |
commit | bc68cd14ccaebc17e7e03a08e51fddfb91007624 (patch) | |
tree | beb32cedafc6232bf8a49fe90f0769d471ea6791 /coreutils | |
parent | dae6aa28598cb2353291f18ca52e768c3259165a (diff) | |
download | busybox-w32-bc68cd14ccaebc17e7e03a08e51fddfb91007624.tar.gz busybox-w32-bc68cd14ccaebc17e7e03a08e51fddfb91007624.tar.bz2 busybox-w32-bc68cd14ccaebc17e7e03a08e51fddfb91007624.zip |
Patch from Denis Vlasenko turning static const int (which gets emitted into
the busybox binary) into enums (which don't).
Diffstat (limited to 'coreutils')
-rw-r--r-- | coreutils/cut.c | 8 | ||||
-rw-r--r-- | coreutils/stty.c | 13 |
2 files changed, 13 insertions, 8 deletions
diff --git a/coreutils/cut.c b/coreutils/cut.c index 526a99393..11e9d5e87 100644 --- a/coreutils/cut.c +++ b/coreutils/cut.c | |||
@@ -45,9 +45,11 @@ struct cut_list { | |||
45 | int endpos; | 45 | int endpos; |
46 | }; | 46 | }; |
47 | 47 | ||
48 | static const int BOL = 0; | 48 | enum { |
49 | static const int EOL = INT_MAX; | 49 | BOL = 0, |
50 | static const int NON_RANGE = -1; | 50 | EOL = INT_MAX, |
51 | NON_RANGE = -1 | ||
52 | }; | ||
51 | 53 | ||
52 | static struct cut_list *cut_lists = NULL; /* growable array holding a series of lists */ | 54 | static struct cut_list *cut_lists = NULL; /* growable array holding a series of lists */ |
53 | static unsigned int nlists = 0; /* number of elements in above list */ | 55 | static unsigned int nlists = 0; /* number of elements in above list */ |
diff --git a/coreutils/stty.c b/coreutils/stty.c index a3526136f..8b70af65e 100644 --- a/coreutils/stty.c +++ b/coreutils/stty.c | |||
@@ -343,9 +343,10 @@ static const struct mode_info mode_info[] = { | |||
343 | MI_ENTRY(stty_dec, combination, OMIT, 0, 0 ), | 343 | MI_ENTRY(stty_dec, combination, OMIT, 0, 0 ), |
344 | }; | 344 | }; |
345 | 345 | ||
346 | static const int NUM_mode_info = | 346 | enum { |
347 | 347 | NUM_mode_info = | |
348 | (sizeof(mode_info) / sizeof(struct mode_info)); | 348 | (sizeof(mode_info) / sizeof(struct mode_info)) |
349 | }; | ||
349 | 350 | ||
350 | /* Control character settings. */ | 351 | /* Control character settings. */ |
351 | struct control_info { | 352 | struct control_info { |
@@ -395,8 +396,10 @@ static const struct control_info control_info[] = { | |||
395 | {stty_time, 0, VTIME}, | 396 | {stty_time, 0, VTIME}, |
396 | }; | 397 | }; |
397 | 398 | ||
398 | static const int NUM_control_info = | 399 | enum { |
399 | (sizeof(control_info) / sizeof(struct control_info)); | 400 | NUM_control_info = |
401 | (sizeof(control_info) / sizeof(struct control_info)) | ||
402 | }; | ||
400 | 403 | ||
401 | #define EMT(t) ((enum mode_type)(t)) | 404 | #define EMT(t) ((enum mode_type)(t)) |
402 | 405 | ||