diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-06-25 10:55:35 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-06-25 10:55:35 +0000 |
commit | 80b8b39899a09c7516920cda5fd343b3086d4824 (patch) | |
tree | aa9903fd6b64d19c5f640fa302272d85c92b204e /networking/tftp.c | |
parent | 1399282b47bb218132a554cbe5b2b0ce4dcc055f (diff) | |
download | busybox-w32-80b8b39899a09c7516920cda5fd343b3086d4824.tar.gz busybox-w32-80b8b39899a09c7516920cda5fd343b3086d4824.tar.bz2 busybox-w32-80b8b39899a09c7516920cda5fd343b3086d4824.zip |
Consolidate ARRAY_SIZE macro; remove one unneeded global var (walter harms <wharms@bfs.de>)
Diffstat (limited to 'networking/tftp.c')
-rw-r--r-- | networking/tftp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/networking/tftp.c b/networking/tftp.c index 8517830b7..b20486cc1 100644 --- a/networking/tftp.c +++ b/networking/tftp.c | |||
@@ -280,13 +280,13 @@ static int tftp( USE_GETPUT(const int cmd,) | |||
280 | "no such user", | 280 | "no such user", |
281 | "bad option", | 281 | "bad option", |
282 | }; | 282 | }; |
283 | enum { NUM_ERRCODE = sizeof(errcode_str) / sizeof(errcode_str[0]) }; | 283 | |
284 | const char *msg = ""; | 284 | const char *msg = ""; |
285 | 285 | ||
286 | if (rbuf[4] != '\0') { | 286 | if (rbuf[4] != '\0') { |
287 | msg = &rbuf[4]; | 287 | msg = &rbuf[4]; |
288 | rbuf[tftp_bufsize - 1] = '\0'; | 288 | rbuf[tftp_bufsize - 1] = '\0'; |
289 | } else if (recv_blk < NUM_ERRCODE) { | 289 | } else if (recv_blk < ARRAY_SIZE(errcode_str)) { |
290 | msg = errcode_str[recv_blk]; | 290 | msg = errcode_str[recv_blk]; |
291 | } | 291 | } |
292 | bb_error_msg("server error: (%u) %s", recv_blk, msg); | 292 | bb_error_msg("server error: (%u) %s", recv_blk, msg); |