emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Consolidate ARRAY_SIZE macro; remove one unneeded global var (walter harms <wharms@bfs.de>)

Browse Source
This commit is contained in:
Denis Vlasenko
2007-06-25 10:55:35 +00:00
parent 1399282b47
commit 80b8b39899
26 changed files with 55 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libbb/speed_table.c
View File

@@ -54,7 +54,7 @@ static const struct speed_map speeds[] = {
#endif
};
enum { NUM_SPEEDS = (sizeof(speeds) / sizeof(struct speed_map)) };
enum { NUM_SPEEDS = ARRAY_SIZE(speeds) };
unsigned int tty_baud_to_value(speed_t speed)
{

4
libbb/u_signal_names.c
View File

@@ -127,7 +127,7 @@ int get_signum(const char *name)
return i;
if (strncasecmp(name, "SIG", 3) == 0)
name += 3;
for (i = 0; i < sizeof(signals) / sizeof(signals[0]); i++)
for (i = 0; i < ARRAY_SIZE(signals); i++)
if (strcasecmp(name, signals[i]) == 0)
return i;
@@ -152,7 +152,7 @@ int get_signum(const char *name)
const char *get_signame(int number)
{
if ((unsigned)number < sizeof(signals) / sizeof(signals[0])) {
if ((unsigned)number < ARRAY_SIZE(signals)) {
if (signals[number][0]) /* if it's not an empty str */
return signals[number];
}