From bff7c062a40379c0797c34f0f3d159e3c6126a29 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 15 May 2010 17:22:58 +0200
Subject: [PATCH] macro: interpret arguments to IOVEC_SET_STRING only once

---
 macro.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/macro.h b/macro.h
index 2379ee2de..622c08eed 100644
--- a/macro.h
+++ b/macro.h
@@ -117,10 +117,12 @@ static inline size_t ALIGN(size_t l) {
 
 #define char_array_0(x) x[sizeof(x)-1] = 0;
 
-#define IOVEC_SET_STRING(iovec, s)              \
+#define IOVEC_SET_STRING(i, s)                  \
         do {                                    \
-                (iovec).iov_base = s;           \
-                (iovec).iov_len = strlen(s);    \
+                struct iovec *_i = &(i);        \
+                char *_s = (char *)(s);         \
+                _i->iov_base = _s;              \
+                _i->iov_len = strlen(_s);       \
         } while(false);
 
 #include "log.h"