sulogin: use bb_error_msg instead of bb_info_msg; better message

[oweals/busybox.git] / networking / tftp.c

diff --git a/networking/tftp.c b/networking/tftp.c
index 7c0ee58d7d0475085ba856327acd4e57d44b6ee8..ad9308e524cf0c2fea93ee14b03be47300109d06 100644 (file)
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -129,10 +129,9 @@ struct globals {
 #endif
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
-struct BUG_G_too_big {
-       char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
-};
-#define INIT_G() do { } while (0)
+#define INIT_G() do { \
+       BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
+} while (0)
 
 #define G_error_pkt_reason (G.error_pkt[3])
 #define G_error_pkt_str    ((char*)(G.error_pkt + 4))
@@ -348,7 +347,6 @@ static int tftp_protocol(
                         * as if it is "block 0" */
                        block_nr = 0;
                }
-
        } else { /* tftp */
                /* Open file (must be after changing user) */
                local_fd = CMD_GET(option_mask32) ? STDOUT_FILENO : STDIN_FILENO;