From 16f6508435773327cc91d08654c32acc14efb850 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 18 Sep 2011 20:18:09 +0200
Subject: waitress: move macro def into function

---
 src/libwaitress/waitress.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/libwaitress/waitress.c b/src/libwaitress/waitress.c
index c360433..baf1ae4 100644
--- a/src/libwaitress/waitress.c
+++ b/src/libwaitress/waitress.c
@@ -458,19 +458,6 @@ static WaitressReturn_t WaitressPollRead (int sockfd, char *buf, size_t count,
 	return WAITRESS_RET_OK;
 }
 
-/* FIXME: compiler macros are ugly... */
-#define FINISH(ret) wRet = ret; goto finish;
-#define WRITE_RET(buf, count) \
-		if ((wRet = WaitressPollWrite (sockfd, buf, count, \
-				&sockpoll, waith->socktimeout)) != WAITRESS_RET_OK) { \
-			FINISH (wRet); \
-		}
-#define READ_RET(buf, count, size) \
-		if ((wRet = WaitressPollRead (sockfd, buf, count, \
-				&sockpoll, waith->socktimeout, size)) != WAITRESS_RET_OK) { \
-			FINISH (wRet); \
-		}
-
 /*	send basic http authorization
  *	@param waitress handle
  *	@param url containing user/password
@@ -531,6 +518,19 @@ static int WaitressParseStatusline (const char * const line) {
  *	@return WaitressReturn_t
  */
 WaitressReturn_t WaitressFetchCall (WaitressHandle_t *waith) {
+/* FIXME: compiler macros are ugly... */
+#define FINISH(ret) wRet = ret; goto finish;
+#define WRITE_RET(buf, count) \
+		if ((wRet = WaitressPollWrite (sockfd, buf, count, \
+				&sockpoll, waith->socktimeout)) != WAITRESS_RET_OK) { \
+			FINISH (wRet); \
+		}
+#define READ_RET(buf, count, size) \
+		if ((wRet = WaitressPollRead (sockfd, buf, count, \
+				&sockpoll, waith->socktimeout, size)) != WAITRESS_RET_OK) { \
+			FINISH (wRet); \
+		}
+
 	struct addrinfo hints, *res;
 	int sockfd;
 	char *buf = NULL;
@@ -757,11 +757,11 @@ finish:
 		return WAITRESS_RET_PARTIAL_FILE;
 	}
 	return wRet;
-}
 
-#undef CLOSE_RET
+#undef FINISH
 #undef WRITE_RET
 #undef READ_RET
+}
 
 const char *WaitressErrorToStr (WaitressReturn_t wRet) {
 	switch (wRet) {
-- 
cgit v1.2.3