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

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

View File

@ -280,13 +280,13 @@ static int tftp( USE_GETPUT(const int cmd,)
"no such user",
"bad option",
};
enum { NUM_ERRCODE = sizeof(errcode_str) / sizeof(errcode_str[0]) };
const char *msg = "";
if (rbuf[4] != '\0') {
msg = &rbuf[4];
rbuf[tftp_bufsize - 1] = '\0';
} else if (recv_blk < NUM_ERRCODE) {
} else if (recv_blk < ARRAY_SIZE(errcode_str)) {
msg = errcode_str[recv_blk];
}
bb_error_msg("server error: (%u) %s", recv_blk, msg);