Many files:

  Changes for type-paranoid MIPSpro compiler.

bk: 40798634WDNn6AnqIQpawEx2BHsgcQ

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index 701d5c3c289b1166add3f9e59aca41052a54f579..e72804b6a980ac5cdee74bff351ab2ddb3370f77 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -984,7 +984,7 @@ getconfig(
                                "Keys directory name required");
                            break;
                        }
-                       keysdir = emalloc(strlen(tokens[1]) + 1);
+                       keysdir = (char *)emalloc(strlen(tokens[1]) + 1);
                        strcpy(keysdir, tokens[1]);
                        break;
 

diff --git a/ntpd/ntp_intres.c b/ntpd/ntp_intres.c
index 1af16f18c4154f355db76938e7517ee5a6a2e944..1e716dc9da0bfa3e01517a297015822b3d1b63a4 100644 (file)
--- a/ntpd/ntp_intres.c
+++ b/ntpd/ntp_intres.c
@@ -490,7 +490,7 @@ findhostaddr(
                        msyslog(LOG_INFO, "findhostaddr: Resolving %s>",
                                stoa(&entry->peer_store));
 #endif
-               entry->ce_name = emalloc(MAXHOSTNAMELEN);
+               entry->ce_name = (char *)emalloc(MAXHOSTNAMELEN);
                error = getnameinfo((const struct sockaddr *)&entry->peer_store,
                                   SOCKLEN(&entry->peer_store),
                                   (char *)&entry->ce_name, MAXHOSTNAMELEN,

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 7bcc927250661619265e0aea046985c7acaa409d..f25b28ec8f12800d69f51b08dd686175ed4de545 100644 (file)
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -2206,7 +2206,7 @@ kill_asyncio(int startfd)
  */
 void
 add_socket_to_list(SOCKET fd){
-       vsock_t *lsock = malloc(sizeof(vsock_t));
+       vsock_t *lsock = (vsock_t *)malloc(sizeof(vsock_t));
        lsock->fd = fd;
 
        ISC_LIST_APPEND(sockets_list, lsock, link);
@@ -2220,7 +2220,7 @@ delete_socket_from_list(SOCKET fd) {
        while(lsock != NULL) {
                next = ISC_LIST_NEXT(lsock, link);
                if(lsock->fd == fd) {
-                       ISC_LIST_DEQUEUE(sockets_list, lsock, link);
+                       ISC_LIST_DEQUEUE_TYPE(sockets_list, lsock, link, vsock_t);
                        free(lsock);
                        break;
                }
@@ -2230,7 +2230,7 @@ delete_socket_from_list(SOCKET fd) {
 }
 void
 add_addr_to_list(struct sockaddr_storage *addr, int if_index){
-       remaddr_t *laddr = malloc(sizeof(remaddr_t));
+       remaddr_t *laddr = (remaddr_t *)malloc(sizeof(remaddr_t));
        memcpy(&laddr->addr, addr, sizeof(addr));
        laddr->if_index = if_index;
 
@@ -2252,7 +2252,7 @@ delete_addr_from_list(struct sockaddr_storage *addr) {
        while(laddr != NULL) {
                next = ISC_LIST_NEXT(laddr, link);
                if(SOCKCMP(&laddr->addr, addr)) {
-                       ISC_LIST_DEQUEUE(remoteaddr_list, laddr, link);
+                       ISC_LIST_DEQUEUE_TYPE(remoteaddr_list, laddr, link, remaddr_t);
                        free(laddr);
                        break;
                }

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 469a46d27467f4e0385943f4ca50bde769a1251f..356d6b9b4a5318d5f9679e4c7401eaab52114aa5 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -1836,9 +1836,9 @@ clock_select(void)
                        indx_size += 5 * 3 * sizeof(*indx);
                        peer_list_size += 5 * sizeof(*peer_list);
                }
-               endpoint = emalloc(endpoint_size);
-               indx = emalloc(indx_size);
-               peer_list = emalloc(peer_list_size);
+               endpoint = (struct endpoint *)emalloc(endpoint_size);
+               indx = (int *)emalloc(indx_size);
+               peer_list = (struct peer **)emalloc(peer_list_size);
        }
 
        /*

diff --git a/ntpdc/ntpdc_ops.c b/ntpdc/ntpdc_ops.c
index 94e408368df051db9c52301658274f6543313103..6f6f20806114c8761bc1e7c36166d3fc3500bd03 100644 (file)
--- a/ntpdc/ntpdc_ops.c
+++ b/ntpdc/ntpdc_ops.c
@@ -293,7 +293,7 @@ peerlist(
 
 again:
        res = doquery(impl_ver, REQ_PEER_LIST, 0, 0, 0, (char *)NULL, &items,
-                     &itemsize, (void *)&plist, 0, 
+                     &itemsize, (char **)&plist, 0, 
                      sizeof(struct info_peer_list));
        
        if (res == INFO_ERR_IMPL && impl_ver == IMPL_XNTPD) {
@@ -383,7 +383,7 @@ dopeers(
 
 again:
        res = doquery(impl_ver, REQ_PEER_LIST_SUM, 0, 0, 0, (char *)NULL,
-                     &items, &itemsize, (void *)&plist, 0, 
+                     &items, &itemsize, (char **)&plist, 0, 
                      sizeof(struct info_peer_summary));
        
        if (res == INFO_ERR_IMPL && impl_ver == IMPL_XNTPD) {
@@ -667,7 +667,7 @@ again:
 
        res = doquery(impl_ver, REQ_PEER_INFO, 0, qitems,
                      sendsize, (char *)plist, &items,
-                     &itemsize, (void *)&pp, 0, sizeof(struct info_peer));
+                     &itemsize, (char **)&pp, 0, sizeof(struct info_peer));
        
        if (res == INFO_ERR_IMPL && impl_ver == IMPL_XNTPD) {
                impl_ver = IMPL_XNTPD_OLD;
@@ -740,7 +740,7 @@ again:
 
        res = doquery(impl_ver, REQ_PEER_STATS, 0, qitems,
                      sendsize, (char *)plist, &items,
-                     &itemsize, (void *)&pp, 0, 
+                     &itemsize, (char **)&pp, 0, 
                      sizeof(struct info_peer_stats));
        
        if (res == INFO_ERR_IMPL && impl_ver == IMPL_XNTPD) {
@@ -838,7 +838,7 @@ loopinfo(
 
 again:
        res = doquery(impl_ver, REQ_LOOP_INFO, 0, 0, 0, (char *)NULL,
-                     &items, &itemsize, (void *)&il, 0, 
+                     &items, &itemsize, (char **)&il, 0, 
                      sizeof(struct info_loop));
        
        if (res == INFO_ERR_IMPL && impl_ver == IMPL_XNTPD) {
@@ -901,7 +901,7 @@ sysinfo(
 
 again:
        res = doquery(impl_ver, REQ_SYS_INFO, 0, 0, 0, (char *)NULL,
-                     &items, &itemsize, (void *)&is, 0,
+                     &items, &itemsize, (char **)&is, 0,
                      sizeof(struct info_sys));
        
        if (res == INFO_ERR_IMPL && impl_ver == IMPL_XNTPD) {
@@ -998,7 +998,7 @@ sysstats(
 
 again:
        res = doquery(impl_ver, REQ_SYS_STATS, 0, 0, 0, (char *)NULL,
-                     &items, &itemsize, (void *)&ss, 0, 
+                     &items, &itemsize, (char **)&ss, 0, 
                      sizeof(struct info_sys_stats));
        
        if (res == INFO_ERR_IMPL && impl_ver == IMPL_XNTPD) {
@@ -1064,7 +1064,7 @@ iostats(
 
 again:
        res = doquery(impl_ver, REQ_IO_STATS, 0, 0, 0, (char *)NULL,
-                     &items, &itemsize, (void *)&io, 0, 
+                     &items, &itemsize, (char **)&io, 0, 
                      sizeof(struct info_io_stats));
        
        if (res == INFO_ERR_IMPL && impl_ver == IMPL_XNTPD) {
@@ -1126,7 +1126,7 @@ memstats(
 
 again:
        res = doquery(impl_ver, REQ_MEM_STATS, 0, 0, 0, (char *)NULL,
-                     &items, &itemsize, (void *)&mem, 0, 
+                     &items, &itemsize, (char **)&mem, 0, 
                      sizeof(struct info_mem_stats));
        
        if (res == INFO_ERR_IMPL && impl_ver == IMPL_XNTPD) {
@@ -1185,7 +1185,7 @@ timerstats(
 
 again:
        res = doquery(impl_ver, REQ_TIMER_STATS, 0, 0, 0, (char *)NULL,
-                     &items, &itemsize, (void *)&tim, 0, 
+                     &items, &itemsize, (char **)&tim, 0, 
                      sizeof(struct info_timer_stats));
        
        if (res == INFO_ERR_IMPL && impl_ver == IMPL_XNTPD) {
@@ -1606,7 +1606,7 @@ reslist(
 
 again:
        res = doquery(impl_ver, REQ_GET_RESTRICT, 0, 0, 0, (char *)NULL,
-                     &items, &itemsize, (void *)&rl, 0, 
+                     &items, &itemsize, (char **)&rl, 0, 
                      sizeof(struct info_restrict));
        
        if (res == INFO_ERR_IMPL && impl_ver == IMPL_XNTPD) {
@@ -2260,7 +2260,7 @@ authinfo(
 
 again:
        res = doquery(impl_ver, REQ_AUTHINFO, 0, 0, 0, (char *)NULL,
-                     &items, &itemsize, (void *)&ia, 0, 
+                     &items, &itemsize, (char **)&ia, 0, 
                      sizeof(struct info_auth));
        
        if (res == INFO_ERR_IMPL && impl_ver == IMPL_XNTPD) {
@@ -2318,7 +2318,7 @@ traps(
 
 again:
        res = doquery(impl_ver, REQ_TRAPS, 0, 0, 0, (char *)NULL,
-                     &items, &itemsize, (void *)&it, 0, 
+                     &items, &itemsize, (char **)&it, 0, 
                      sizeof(struct info_trap));
        
        if (res == INFO_ERR_IMPL && impl_ver == IMPL_XNTPD) {
@@ -2559,7 +2559,7 @@ ctlstats(
 
 again:
        res = doquery(impl_ver, REQ_GET_CTLSTATS, 0, 0, 0, (char *)NULL,
-                     &items, &itemsize, (void *)&ic, 0, 
+                     &items, &itemsize, (char **)&ic, 0, 
                      sizeof(struct info_control));
        
        if (res == INFO_ERR_IMPL && impl_ver == IMPL_XNTPD) {
@@ -2635,7 +2635,7 @@ clockstat(
 again:
        res = doquery(impl_ver, REQ_GET_CLOCKINFO, 0, qitems,
                      sizeof(u_int32), (char *)clist, &items,
-                     &itemsize, (void *)&cl, 0, sizeof(struct info_clock));
+                     &itemsize, (char **)&cl, 0, sizeof(struct info_clock));
        
        if (res == INFO_ERR_IMPL && impl_ver == IMPL_XNTPD) {
                impl_ver = IMPL_XNTPD_OLD;
@@ -2808,7 +2808,7 @@ clkbug(
 again:
        res = doquery(impl_ver, REQ_GET_CLKBUGINFO, 0, qitems,
                      sizeof(u_int32), (char *)clist, &items,
-                     &itemsize, (void *)&cl, 0, sizeof(struct info_clkbug));
+                     &itemsize, (char **)&cl, 0, sizeof(struct info_clkbug));
        
        if (res == INFO_ERR_IMPL && impl_ver == IMPL_XNTPD) {
                impl_ver = IMPL_XNTPD_OLD;
@@ -2895,7 +2895,7 @@ kerninfo(
 
 again:
        res = doquery(impl_ver, REQ_GET_KERNEL, 0, 0, 0, (char *)NULL,
-                     &items, &itemsize, (void *)&ik, 0, 
+                     &items, &itemsize, (char **)&ik, 0, 
                      sizeof(struct info_kernel));
 
        if (res == INFO_ERR_IMPL && impl_ver == IMPL_XNTPD) {

diff --git a/ntpq/ntpq.c b/ntpq/ntpq.c
index cbb628315182491821cf4c3dd0b319777090954d..691f5464112483191de50cd9fb07b036e26e09ca 100644 (file)
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -1916,8 +1916,8 @@ decodeint(
 {
        if (*str == '0') {
                if (*(str+1) == 'x' || *(str+1) == 'X')
-                   return hextoint(str+2, (void *)&val);
-               return octtoint(str, (void *)&val);
+                   return hextoint(str+2, (u_long *)&val);
+               return octtoint(str, (u_long *)&val);
        }
        return atoint(str, val);
 }

diff --git a/ntpq/ntpq_ops.c b/ntpq/ntpq_ops.c
index 35c9fd7e3b934e7058157bc72971a2af7fc2ded7..a63a81b436d702d7fcebf10b17b07c2099fb8cff 100644 (file)
--- a/ntpq/ntpq_ops.c
+++ b/ntpq/ntpq_ops.c
@@ -876,7 +876,7 @@ dogetassoc(
        u_short rstatus;
 
        res = doquery(CTL_OP_READSTAT, 0, 0, 0, (char *)0, &rstatus,
-                         &dsize, (void *)&datap);
+                         &dsize, (char **)&datap);
 
        if (res != 0)
                return 0;