commit 7dcf5ed6fb4c13bdc329e12acce4e557b16cc369
author Patrick Monnerat <patrick.monnerat@dh.com> Wed Nov 18 19:00:38 2015 +0100
committer Daniel Stenberg <daniel@haxx.se> Mon Jan 18 13:35:28 2016 +0100
tree 3bea4d0093f0e9065ee0e24ce4c314030971f974
parent 8ba6bf2aefea645b36ffebead19ea11a48324c2d

Protect callback function calls from macro substitution

Some structure fields holding callback addresses have the same name as the
underlying system function (connect, send, recv). Set parentheses around
their reference to suppress a possible macro substitution.

Use a macro for connect() on OS/400 to resolve a const/nonconst parameter
problem.

src/agent.c

diff --git a/src/agent.c b/src/agent.c
index b797cbd..462b6ae 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -688,7 +688,7 @@
     int i, rc = -1;
     for (i = 0; supported_backends[i].name; i++) {
         agent->ops = supported_backends[i].ops;
-        rc = agent->ops->connect(agent);
+        rc = (agent->ops->connect)(agent);
         if (!rc)
             return 0;
     }

src/libssh2_priv.h

diff --git a/src/libssh2_priv.h b/src/libssh2_priv.h
index 1023943..ae691ad 100644
--- a/src/libssh2_priv.h
+++ b/src/libssh2_priv.h
@@ -132,6 +132,11 @@
 
 #endif /* WIN32 */
 
+#ifdef __OS400__
+/* Force parameter type. */
+#define send(s, b, l, f)    send((s), (unsigned char *) (b), (l), (f))
+#endif
+
 #include "crypto.h"
 
 #ifdef HAVE_WINSOCK2_H
@@ -183,9 +188,9 @@
                       (channel), &(channel)->abstract)
 
 #define LIBSSH2_SEND_FD(session, fd, buffer, length, flags) \
-    session->send(fd, buffer, length, flags, &session->abstract)
+    (session->send)(fd, buffer, length, flags, &session->abstract)
 #define LIBSSH2_RECV_FD(session, fd, buffer, length, flags) \
-    session->recv(fd, buffer, length, flags, &session->abstract)
+    (session->recv)(fd, buffer, length, flags, &session->abstract)
 
 #define LIBSSH2_SEND(session, buffer, length, flags)  \
     LIBSSH2_SEND_FD(session, session->socket_fd, buffer, length, flags)