From 35e271a2bb288d852413990c887ed1dfcbfa39b6 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 26 Jan 2021 15:09:22 +0100 Subject: urldata: move 'ints' to the end of 'connectdata' To optimize storage slightly. --- lib/urldata.h | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/lib/urldata.h b/lib/urldata.h index 0d8703a4b..7b80a0797 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -1101,31 +1101,30 @@ struct connectdata { struct mqtt_conn mqtt; } proto; - int cselect_bits; /* bitmask of socket events */ - int waitfor; /* current READ/WRITE bits to wait for */ - -#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI) - int socks5_gssapi_enctype; + struct http_connect_state *connect_state; /* for HTTP CONNECT */ + struct connectbundle *bundle; /* The bundle we are member of */ +#ifdef USE_UNIX_SOCKETS + char *unix_domain_socket; +#endif +#ifdef USE_HYPER + /* if set, an alternative data transfer function */ + Curl_datastream datastream; #endif - /* When this connection is created, store the conditions for the local end bind. This is stored before the actual bind and before any connection is made and will serve the purpose of being used for comparison reasons so that subsequent bound-requested connections aren't accidentally re-using wrong connections. */ char *localdev; - unsigned short localport; int localportrange; - struct http_connect_state *connect_state; /* for HTTP CONNECT */ - struct connectbundle *bundle; /* The bundle we are member of */ + int cselect_bits; /* bitmask of socket events */ + int waitfor; /* current READ/WRITE bits to wait for */ int negnpn; /* APLN or NPN TLS negotiated protocol, CURL_HTTP_VERSION* */ -#ifdef USE_UNIX_SOCKETS - char *unix_domain_socket; -#endif -#ifdef USE_HYPER - /* if set, an alternative data transfer function */ - Curl_datastream datastream; + +#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI) + int socks5_gssapi_enctype; #endif + unsigned short localport; }; /* The end of connectdata. */ -- cgit v1.2.1