consistent casting of 'setsockopt' argument

bk: 5a7ffe47pOy4Jo2f6vpNQWYbJ5Ntgg

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 2870a0ec05e69884028101061ea02619ad848773..ed5f0dcaff40faf95c00b9192c3a1f45aa0c20e0 100644 (file)
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -1600,7 +1600,7 @@ set_wildcard_reuse(
 
        if (fd != INVALID_SOCKET) {
                if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
-                              (char *)&on, sizeof(on)))
+                              (void *)&on, sizeof(on)))
                        msyslog(LOG_ERR,
                                "set_wildcard_reuse: setsockopt(SO_REUSEADDR, %s) failed: %m",
                                on ? "on" : "off");
@@ -2156,7 +2156,7 @@ set_excladdruse(
 #endif
 
        failed = setsockopt(fd, SOL_SOCKET, SO_EXCLUSIVEADDRUSE,
-                           (char *)&one, sizeof(one));
+                           (void *)&one, sizeof(one));
 
        if (!failed)
                return;
@@ -2210,7 +2210,7 @@ set_reuseaddr(
 
                if (ep->fd != INVALID_SOCKET) {
                        if (setsockopt(ep->fd, SOL_SOCKET, SO_REUSEADDR,
-                                      (char *)&flag, sizeof(flag))) {
+                                      (void *)&flag, sizeof(flag))) {
                                msyslog(LOG_ERR, "set_reuseaddr: setsockopt(%s, SO_REUSEADDR, %s) failed: %m",
                                        stoa(&ep->sin), flag ? "on" : "off");
                        }
@@ -2253,7 +2253,7 @@ socket_broadcast_enable(
        if (IS_IPV4(baddr)) {
                /* if this interface can support broadcast, set SO_BROADCAST */
                if (setsockopt(fd, SOL_SOCKET, SO_BROADCAST,
-                              (char *)&on, sizeof(on)))
+                              (void *)&on, sizeof(on)))
                        msyslog(LOG_ERR,
                                "setsockopt(SO_BROADCAST) enable failure on address %s: %m",
                                stoa(baddr));
@@ -2284,7 +2284,7 @@ socket_broadcast_disable(
        int off = 0;    /* This seems to be OK as an int */
 
        if (IS_IPV4(baddr) && setsockopt(iface->fd, SOL_SOCKET,
-           SO_BROADCAST, (char *)&off, sizeof(off)))
+           SO_BROADCAST, (void *)&off, sizeof(off)))
                msyslog(LOG_ERR,
                        "setsockopt(SO_BROADCAST) disable failure on address %s: %m",
                        stoa(baddr));
@@ -2365,7 +2365,7 @@ enable_multicast_if(
                 */
                if (setsockopt(iface->fd, IPPROTO_IP,
                               IP_MULTICAST_LOOP,
-                              SETSOCKOPT_ARG_CAST &off,
+                              (void *)&off,
                               sizeof(off))) {
 
                        msyslog(LOG_ERR,
@@ -2384,7 +2384,7 @@ enable_multicast_if(
                 */
                if (setsockopt(iface->fd, IPPROTO_IPV6,
                               IPV6_MULTICAST_LOOP,
-                              (char *) &off6, sizeof(off6))) {
+                              (void *) &off6, sizeof(off6))) {
 
                        msyslog(LOG_ERR,
                                "setsockopt IPV6_MULTICAST_LOOP failed: %m on socket %d, addr %s for multicast address %s",
@@ -2426,7 +2426,7 @@ socket_multicast_enable(
                if (setsockopt(iface->fd,
                               IPPROTO_IP,
                               IP_ADD_MEMBERSHIP,
-                              (char *)&mreq,
+                              (void *)&mreq,
                               sizeof(mreq))) {
                        DPRINTF(2, (
                                "setsockopt IP_ADD_MEMBERSHIP failed: %m on socket %d, addr %s for %x / %x (%s)",
@@ -2456,7 +2456,7 @@ socket_multicast_enable(
                mreq6.ipv6mr_interface = iface->ifindex;
 
                if (setsockopt(iface->fd, IPPROTO_IPV6,
-                              IPV6_JOIN_GROUP, (char *)&mreq6,
+                              IPV6_JOIN_GROUP, (void *)&mreq6,
                               sizeof(mreq6))) {
                        DPRINTF(2, (
                                "setsockopt IPV6_JOIN_GROUP failed: %m on socket %d, addr %s for interface %u (%s)",
@@ -2510,7 +2510,7 @@ socket_multicast_disable(
                mreq.imr_multiaddr = SOCK_ADDR4(maddr);
                mreq.imr_interface = SOCK_ADDR4(&iface->sin);
                if (setsockopt(iface->fd, IPPROTO_IP,
-                              IP_DROP_MEMBERSHIP, (char *)&mreq,
+                              IP_DROP_MEMBERSHIP, (void *)&mreq,
                               sizeof(mreq))) {
 
                        msyslog(LOG_ERR,
@@ -2534,7 +2534,7 @@ socket_multicast_disable(
                mreq6.ipv6mr_interface = iface->ifindex;
 
                if (setsockopt(iface->fd, IPPROTO_IPV6,
-                              IPV6_LEAVE_GROUP, (char *)&mreq6,
+                              IPV6_LEAVE_GROUP, (void *)&mreq6,
                               sizeof(mreq6))) {
 
                        msyslog(LOG_ERR,
@@ -2896,7 +2896,7 @@ open_socket(
        if (isc_win32os_versioncheck(5, 1, 0, 0) < 0)  /* before 5.1 */
 #endif
                if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
-                              (char *)((turn_off_reuse)
+                              (void *)((turn_off_reuse)
                                            ? &off
                                            : &on),
                               sizeof(on))) {
@@ -2924,7 +2924,7 @@ open_socket(
         */
        if (IS_IPV4(addr)) {
 #if defined(IPPROTO_IP) && defined(IP_TOS)
-               if (setsockopt(fd, IPPROTO_IP, IP_TOS, (char*)&qos,
+               if (setsockopt(fd, IPPROTO_IP, IP_TOS, (void *)&qos,
                               sizeof(qos)))
                        msyslog(LOG_ERR,
                                "setsockopt IP_TOS (%02x) fails on address %s: %m",
@@ -2939,7 +2939,7 @@ open_socket(
         */
        if (IS_IPV6(addr)) {
 #if defined(IPPROTO_IPV6) && defined(IPV6_TCLASS)
-               if (setsockopt(fd, IPPROTO_IPV6, IPV6_TCLASS, (char*)&qos,
+               if (setsockopt(fd, IPPROTO_IPV6, IPV6_TCLASS, (void *)&qos,
                               sizeof(qos)))
                        msyslog(LOG_ERR,
                                "setsockopt IPV6_TCLASS (%02x) fails on address %s: %m",
@@ -2948,14 +2948,14 @@ open_socket(
 #ifdef IPV6_V6ONLY
                if (isc_net_probe_ipv6only() == ISC_R_SUCCESS
                    && setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY,
-                   (char*)&on, sizeof(on)))
+                   (void *)&on, sizeof(on)))
                        msyslog(LOG_ERR,
                                "setsockopt IPV6_V6ONLY on fails on address %s: %m",
                                stoa(addr));
 #endif
 #ifdef IPV6_BINDV6ONLY
                if (setsockopt(fd, IPPROTO_IPV6, IPV6_BINDV6ONLY,
-                   (char*)&on, sizeof(on)))
+                   (void *)&on, sizeof(on)))
                        msyslog(LOG_ERR,
                                "setsockopt IPV6_BINDV6ONLY on fails on address %s: %m",
                                stoa(addr));
@@ -3007,7 +3007,7 @@ open_socket(
 #ifdef HAVE_TIMESTAMP
        {
                if (setsockopt(fd, SOL_SOCKET, SO_TIMESTAMP,
-                              (char*)&on, sizeof(on)))
+                              (void *)&on, sizeof(on)))
                        msyslog(LOG_DEBUG,
                                "setsockopt SO_TIMESTAMP on fails on address %s: %m",
                                stoa(addr));
@@ -3019,7 +3019,7 @@ open_socket(
 #ifdef HAVE_TIMESTAMPNS
        {
                if (setsockopt(fd, SOL_SOCKET, SO_TIMESTAMPNS,
-                              (char*)&on, sizeof(on)))
+                              (void *)&on, sizeof(on)))
                        msyslog(LOG_DEBUG,
                                "setsockopt SO_TIMESTAMPNS on fails on address %s: %m",
                                stoa(addr));
@@ -3031,7 +3031,7 @@ open_socket(
 #ifdef HAVE_BINTIME
        {
                if (setsockopt(fd, SOL_SOCKET, SO_BINTIME,
-                              (char*)&on, sizeof(on)))
+                              (void *)&on, sizeof(on)))
                        msyslog(LOG_DEBUG,
                                "setsockopt SO_BINTIME on fails on address %s: %m",
                                stoa(addr));
@@ -3998,7 +3998,7 @@ findlocalinterface(
                on = 1;
                if (SOCKET_ERROR == setsockopt(s, SOL_SOCKET,
                                                SO_BROADCAST,
-                                               (char *)&on,
+                                               (void *)&on,
                                                sizeof(on))) {
                        closesocket(s);
                        return NULL;

diff --git a/ntpd/refclock_gpsdjson.c b/ntpd/refclock_gpsdjson.c
index 00cd3fc534ea57dffae9dd4102e28b1c9e1a7ff8..a1fb896369d0a5b4468e1a80122fc8c2169d1406 100644 (file)
--- a/ntpd/refclock_gpsdjson.c
+++ b/ntpd/refclock_gpsdjson.c
@@ -1891,7 +1891,7 @@ gpsd_init_socket(
         */
        ov = 1;
        rc = setsockopt(up->fdt, IPPROTO_TCP, TCP_NODELAY,
-                       (char*)&ov, sizeof(ov));
+                       (void *)&ov, sizeof(ov));
        if (-1 == rc) {
                if (syslogok(pp, up))
                        msyslog(LOG_INFO,

diff --git a/ntpdc/ntpdc.c b/ntpdc/ntpdc.c
index 0375d36813cdad3486eb3db297197548cb6252fd..3aeaddc1ae0ccec7582612b42e198b18fab40a57 100644 (file)
--- a/ntpdc/ntpdc.c
+++ b/ntpdc/ntpdc.c
@@ -499,7 +499,7 @@ openhost(
                int optionValue = SO_SYNCHRONOUS_NONALERT;
                int err;
 
-               err = setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, (char *)&optionValue, sizeof(optionValue));
+               err = setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, (void *)&optionValue, sizeof(optionValue));
                if (err != NO_ERROR) {
                        (void) fprintf(stderr, "cannot open nonoverlapped sockets\n");
                        exit(1);
@@ -519,7 +519,7 @@ openhost(
                int rbufsize = INITDATASIZE + 2048; /* 2K for slop */
 
                if (setsockopt(sockfd, SOL_SOCKET, SO_RCVBUF,
-                              &rbufsize, sizeof(int)) == -1)
+                              (void *)&rbufsize, sizeof(int)) == -1)
                    error("setsockopt");
        }
 # endif

diff --git a/ntpq/ntpq.c b/ntpq/ntpq.c
index 3cdf230c6c26da721708c316e13ffe277a90b379..17c2f17d38854f9f46e168a8e4f5b46df7154357 100644 (file)
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -748,7 +748,7 @@ openhost(
                int err;
 
                err = setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE,
-                                (char *)&optionValue, sizeof(optionValue));
+                                (void *)&optionValue, sizeof(optionValue));
                if (err) {
                        mfprintf(stderr,
                                 "setsockopt(SO_SYNCHRONOUS_NONALERT)"
@@ -772,7 +772,7 @@ openhost(
 # ifdef SO_RCVBUF
        { int rbufsize = DATASIZE + 2048;       /* 2K for slop */
        if (setsockopt(sockfd, SOL_SOCKET, SO_RCVBUF,
-                      &rbufsize, sizeof(int)) == -1)
+                      (void *)&rbufsize, sizeof(int)) == -1)
                error("setsockopt");
        }
 # endif