*: add optimization barrier to all "G trick" locations
This commit is contained in:
@@ -322,7 +322,7 @@ struct globals {
|
||||
#define http_error_page (G.http_error_page )
|
||||
#define proxy (G.proxy )
|
||||
#define INIT_G() do { \
|
||||
PTR_TO_GLOBALS = xzalloc(sizeof(G)); \
|
||||
SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
|
||||
USE_FEATURE_HTTPD_BASIC_AUTH(g_realm = "Web Server Authentication";) \
|
||||
bind_addr_or_port = "80"; \
|
||||
file_size = -1; \
|
||||
|
||||
@@ -129,7 +129,7 @@ struct globals {
|
||||
#define master (G.master )
|
||||
#define slave (G.slave )
|
||||
#define INIT_G() do { \
|
||||
PTR_TO_GLOBALS = xzalloc(sizeof(G)); \
|
||||
SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
|
||||
} while (0)
|
||||
|
||||
|
||||
|
||||
@@ -97,7 +97,6 @@ struct globals {
|
||||
};
|
||||
|
||||
#define G (*ptr_to_globals)
|
||||
|
||||
#define wrote_out (G.wrote_out )
|
||||
#define wrote_net (G.wrote_net )
|
||||
#define ouraddr (G.ouraddr )
|
||||
@@ -115,6 +114,10 @@ struct globals {
|
||||
#else
|
||||
#define o_interval 0
|
||||
#endif
|
||||
#define INIT_G() do { \
|
||||
SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
|
||||
} while (0)
|
||||
|
||||
|
||||
/* Must match getopt32 call! */
|
||||
enum {
|
||||
@@ -678,9 +681,7 @@ int nc_main(int argc, char **argv)
|
||||
int x;
|
||||
unsigned o_lport = 0;
|
||||
|
||||
/* I was in this barbershop quartet in Skokie IL ... */
|
||||
/* round up the usual suspects, i.e. malloc up all the stuff we need */
|
||||
PTR_TO_GLOBALS = xzalloc(sizeof(G));
|
||||
INIT_G();
|
||||
|
||||
/* catch a signal or two for cleanup */
|
||||
bb_signals(0
|
||||
|
||||
@@ -77,7 +77,7 @@ struct globals {
|
||||
#define xargs (G.xargs )
|
||||
#define fargs (G.fargs )
|
||||
#define INIT_G() do { \
|
||||
PTR_TO_GLOBALS = xzalloc(sizeof(G)); \
|
||||
SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
|
||||
xargs[0] = "openssl"; \
|
||||
xargs[1] = "s_client"; \
|
||||
xargs[2] = "-quiet"; \
|
||||
|
||||
@@ -378,7 +378,7 @@ struct globals {
|
||||
#define wherefrom (G.wherefrom)
|
||||
#define gwlist (G.gwlist )
|
||||
#define INIT_G() do { \
|
||||
PTR_TO_GLOBALS = xzalloc(sizeof(G)); \
|
||||
SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
|
||||
maxpacket = 32 * 1024; \
|
||||
port = 32768 + 666; \
|
||||
waittime = 5; \
|
||||
|
||||
Reference in New Issue
Block a user