From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 9 May 2022 11:55:28 +0000 (+0200)
Subject: socket-util: don't reference field by macro parameter name
X-Git-Tag: v251-rc3~31^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b501e42e7137fc890e02f18046edb2262df643f9;p=thirdparty%2Fsystemd.git

socket-util: don't reference field by macro parameter name

Let's avoid ambigituies here. (Interesting that the current users
compiled at all, in fact)
---

diff --git a/src/basic/socket-util.h b/src/basic/socket-util.h
index 2fd1a2a1659..5d9c0567443 100644
--- a/src/basic/socket-util.h
+++ b/src/basic/socket-util.h
@@ -224,9 +224,9 @@ struct cmsghdr* cmsg_find(struct msghdr *mh, int level, int type, socklen_t leng
                          strnlen(_sa->sun_path, sizeof(_sa->sun_path))+1); \
         })
 
-#define SOCKADDR_LEN(sa)                                                \
+#define SOCKADDR_LEN(saddr)                                             \
         ({                                                              \
-                const union sockaddr_union *__sa = &(sa);               \
+                const union sockaddr_union *__sa = &(saddr);            \
                 size_t _len;                                            \
                 switch (__sa->sa.sa_family) {                           \
                 case AF_INET:                                           \