find: add zeroing of G.xxx; ftpd - remove extraneous zeroing of G.xxx
Brought "G trick" to the same shape in a few more places. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
@@ -662,7 +662,7 @@ popen_ls(const char *opt)
|
||||
execv(bb_busybox_exec_path + 1, (char**) argv);
|
||||
_exit(127);
|
||||
#else
|
||||
memset(&G, 0, sizeof(G));
|
||||
/* memset(&G, 0, sizeof(G)); - ls_main does it */
|
||||
exit(ls_main(ARRAY_SIZE(argv) - 1, (char**) argv));
|
||||
#endif
|
||||
}
|
||||
@@ -1114,7 +1114,7 @@ int ftpd_main(int argc UNUSED_PARAM, char **argv)
|
||||
/* --group-directories-first would be nice, but ls don't do that yet */
|
||||
xchdir(argv[2]);
|
||||
argv[2] = (char*)"--";
|
||||
memset(&G, 0, sizeof(G));
|
||||
/* memset(&G, 0, sizeof(G)); - ls_main does it */
|
||||
return ls_main(argc, argv);
|
||||
}
|
||||
#endif
|
||||
|
@@ -77,11 +77,10 @@ struct globals {
|
||||
struct termios termios_raw;
|
||||
};
|
||||
#define G (*(struct globals*)&bb_common_bufsiz1)
|
||||
void BUG_telnet_globals_too_big(void);
|
||||
#define INIT_G() do { \
|
||||
if (sizeof(G) > COMMON_BUFSIZE) \
|
||||
BUG_telnet_globals_too_big(); \
|
||||
/* memset(&G, 0, sizeof G); - already is */ \
|
||||
struct G_sizecheck { \
|
||||
char G_sizecheck[sizeof(G) > COMMON_BUFSIZE ? -1 : 1]; \
|
||||
}; \
|
||||
} while (0)
|
||||
|
||||
/* Function prototypes */
|
||||
|
Reference in New Issue
Block a user