From a33f98d90779740c49987bd825ceb560c0ffb1f5 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 24 Dec 2011 17:27:39 +0100 Subject: Avoid struct padding where possible Pointed out by -Wpadding. Does not decrease memory usage/binary size though. --- src/libwaitress/waitress.h | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'src/libwaitress/waitress.h') diff --git a/src/libwaitress/waitress.h b/src/libwaitress/waitress.h index b988591..f91985d 100644 --- a/src/libwaitress/waitress.h +++ b/src/libwaitress/waitress.h @@ -83,30 +83,37 @@ typedef enum { /* reusable handle */ typedef struct { - WaitressUrl_t url; + int timeout; WaitressMethod_t method; + const char *extraHeaders; const char *postData; - WaitressUrl_t proxy; /* extra data handed over to callback function */ void *data; WaitressCbReturn_t (*callback) (void *, size_t, void *); - int timeout; const char *tlsFingerprint; + + WaitressUrl_t url; + WaitressUrl_t proxy; + gnutls_certificate_credentials_t tlsCred; /* per-request data */ struct { - size_t contentLength, contentReceived, chunkSize; int sockfd; + + /* temporary return value storage */ + WaitressReturn_t readWriteRet; + + size_t contentLength, contentReceived, chunkSize; + char *buf; - gnutls_session_t tlsSession; /* first argument is WaitressHandle_t, but that's not defined yet */ WaitressHandlerReturn_t (*dataHandler) (void *, char *, const size_t); WaitressReturn_t (*read) (void *, char *, const size_t, size_t *); WaitressReturn_t (*write) (void *, const char *, const size_t); - /* temporary return value storage */ - WaitressReturn_t readWriteRet; + + gnutls_session_t tlsSession; } request; } WaitressHandle_t; -- cgit v1.2.3