lint to make gcc shut up

SCCS-vsn: old/talk/talk/ctl.c 1.4
SCCS-vsn: old/talk/talk/ctl_transact.c 1.3
SCCS-vsn: old/talk/talk/init_disp.c 1.3
SCCS-vsn: old/talk/talk/invite.c 5.2
SCCS-vsn: old/talk/talk/io.c 5.2
SCCS-vsn: old/talk/talk/look_up.c 6.3
SCCS-vsn: old/talk/talk/msgs.c 5.2

diff --git a/usr/src/old/talk/talk/ctl.c b/usr/src/old/talk/talk/ctl.c
index 89107bc..09bc15c 100644 (file)
--- a/usr/src/old/talk/talk/ctl.c
+++ b/usr/src/old/talk/talk/ctl.c
@@ -41,10 +41,10 @@ open_sockt()
     sockt = socket(AF_INET, SOCK_STREAM, 0);
     if (sockt <= 0)
        p_error("Bad socket");
     sockt = socket(AF_INET, SOCK_STREAM, 0);
     if (sockt <= 0)
        p_error("Bad socket");

-    if (bind(sockt, &my_addr, sizeof(my_addr)) != 0)
+    if (bind(sockt, (struct sockaddr *)&my_addr, sizeof(my_addr)) != 0)

        p_error("Binding local socket");
     length = sizeof(my_addr);
        p_error("Binding local socket");
     length = sizeof(my_addr);

-    if (getsockname(sockt, &my_addr, &length) == -1)
+    if (getsockname(sockt, (struct sockaddr *)&my_addr, &length) == -1)

        p_error("Bad address for socket");
 }
 
        p_error("Bad address for socket");
 }
 


@@ -58,10 +58,10 @@ open_ctl()
     ctl_sockt = socket(AF_INET, SOCK_DGRAM, 0);
     if (ctl_sockt <= 0)
        p_error("Bad socket");
     ctl_sockt = socket(AF_INET, SOCK_DGRAM, 0);
     if (ctl_sockt <= 0)
        p_error("Bad socket");

-    if (bind(ctl_sockt, &ctl_addr, sizeof(ctl_addr)) != 0)
+    if (bind(ctl_sockt, (struct sockaddr *)&ctl_addr, sizeof(ctl_addr)) != 0)

        p_error("Couldn't bind to control socket");
     length = sizeof(ctl_addr);
        p_error("Couldn't bind to control socket");
     length = sizeof(ctl_addr);

-    if (getsockname(ctl_sockt, &ctl_addr, &length) == -1)
+    if (getsockname(ctl_sockt, (struct sockaddr *)&ctl_addr, &length) == -1)

        p_error("Bad address for ctl socket");
 }
 
        p_error("Bad address for ctl socket");
 }
 

diff --git a/usr/src/old/talk/talk/ctl_transact.c b/usr/src/old/talk/talk/ctl_transact.c
index 4f1537f..6962965 100644 (file)
--- a/usr/src/old/talk/talk/ctl_transact.c
+++ b/usr/src/old/talk/talk/ctl_transact.c
@@ -48,7 +48,8 @@ ctl_transact(target, msg, type, response)
                /* keep sending the message until a response is obtained */
                do {
                        cc = sendto(ctl_sockt, (char *)&msg, sizeof(CTL_MSG), 0,
                /* keep sending the message until a response is obtained */
                do {
                        cc = sendto(ctl_sockt, (char *)&msg, sizeof(CTL_MSG), 0,

-                               &daemon_addr, sizeof(daemon_addr));
+                           (struct sockaddr *)&daemon_addr,
+                           sizeof(daemon_addr));

                        if (cc != sizeof(CTL_MSG)) {
                                if (errno == EINTR)
                                        continue;
                        if (cc != sizeof(CTL_MSG)) {
                                if (errno == EINTR)
                                        continue;

diff --git a/usr/src/old/talk/talk/init_disp.c b/usr/src/old/talk/talk/init_disp.c
index 78a161f..52d78fc 100644 (file)
--- a/usr/src/old/talk/talk/init_disp.c
+++ b/usr/src/old/talk/talk/init_disp.c
@@ -15,6 +15,7 @@ static char sccsid[] = "@(#)init_disp.c       5.1 (Berkeley) 6/6/85";
 
 #define USE_OLD_TTY
 #include "talk.h"
 
 #define USE_OLD_TTY
 #include "talk.h"

+#include <sgtty.h>

 #include <signal.h>
 
 /* 
 #include <signal.h>
 
 /* 

diff --git a/usr/src/old/talk/talk/invite.c b/usr/src/old/talk/talk/invite.c
index f846531..a95a034 100644 (file)
--- a/usr/src/old/talk/talk/invite.c
+++ b/usr/src/old/talk/talk/invite.c
@@ -143,12 +143,14 @@ send_delete()
         */
        msg.id_num = remote_id;
        daemon_addr.sin_addr = his_machine_addr;
         */
        msg.id_num = remote_id;
        daemon_addr.sin_addr = his_machine_addr;

-       if (sendto(ctl_sockt, &msg, sizeof(CTL_MSG), 0, &daemon_addr,
+       if (sendto(ctl_sockt, &msg, sizeof(CTL_MSG), 0,
+           (struct sockaddr *)&daemon_addr,

            sizeof(daemon_addr)) != sizeof(CTL_MSG))
                perror("send_delete remote");
        msg.id_num = local_id;
        daemon_addr.sin_addr = my_machine_addr;
            sizeof(daemon_addr)) != sizeof(CTL_MSG))
                perror("send_delete remote");
        msg.id_num = local_id;
        daemon_addr.sin_addr = my_machine_addr;

-       if (sendto(ctl_sockt, &msg, sizeof(CTL_MSG), 0, &daemon_addr,
+       if (sendto(ctl_sockt, &msg, sizeof(CTL_MSG), 0,
+           (struct sockaddr *)&daemon_addr,

            sizeof(daemon_addr)) != sizeof(CTL_MSG))
                perror("send_delete local");
 }
            sizeof(daemon_addr)) != sizeof(CTL_MSG))
                perror("send_delete local");
 }

diff --git a/usr/src/old/talk/talk/io.c b/usr/src/old/talk/talk/io.c
index b5796d0..e7fc4b5 100644 (file)
--- a/usr/src/old/talk/talk/io.c
+++ b/usr/src/old/talk/talk/io.c
@@ -15,6 +15,7 @@ static char sccsid[] = "@(#)io.c      5.1 (Berkeley) 6/6/85";
  */
 
 #include "talk.h"
  */
 
 #include "talk.h"

+#include <sys/ioctl.h>

 #include <stdio.h>
 #include <errno.h>
 #include <sys/time.h>
 #include <stdio.h>
 #include <errno.h>
 #include <sys/time.h>

diff --git a/usr/src/old/talk/talk/look_up.c b/usr/src/old/talk/talk/look_up.c
index 1055c0d..db07b50 100644 (file)
--- a/usr/src/old/talk/talk/look_up.c
+++ b/usr/src/old/talk/talk/look_up.c
@@ -7,7 +7,7 @@
 /* from "@(#)look_up.c 5.1 (Berkeley) 6/6/85"; */
 
 #ifndef lint
 /* from "@(#)look_up.c 5.1 (Berkeley) 6/6/85"; */
 
 #ifndef lint

-static char sccsid[] = "@(#)look_up.c  6.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)look_up.c  6.3 (Berkeley) %G%";

 #endif not lint
 
 #include "talk_ctl.h"
 #endif not lint
 
 #include "talk_ctl.h"


@@ -33,7 +33,8 @@ check_local()
 again:
        swapresponse(&response);
        response.addr.sin_family = AF_INET;
 again:
        swapresponse(&response);
        response.addr.sin_family = AF_INET;

-       if (connect(sockt, &response.addr, sizeof(response.addr)) != -1)
+       if (connect(sockt,
+           (struct sockaddr *)&response.addr, sizeof(response.addr)) != -1)

                return (1);
        if (errno == EINTR)
                goto again;
                return (1);
        if (errno == EINTR)
                goto again;

diff --git a/usr/src/old/talk/talk/msgs.c b/usr/src/old/talk/talk/msgs.c
index 8f3d432..68267bc 100644 (file)
--- a/usr/src/old/talk/talk/msgs.c
+++ b/usr/src/old/talk/talk/msgs.c
@@ -28,6 +28,7 @@ static        struct itimerval itimer;
 static struct timeval wait = { MSG_INTERVAL , 0};
 static struct timeval undo = { LONG_TIME, 0};
        
 static struct timeval wait = { MSG_INTERVAL , 0};
 static struct timeval undo = { LONG_TIME, 0};
        

+void

 disp_msg()
 {
 
 disp_msg()
 {
 


@@ -40,7 +41,7 @@ start_msgs()
        message(current_state);
        signal(SIGALRM, disp_msg);
        itimer.it_value = itimer.it_interval = wait;
        message(current_state);
        signal(SIGALRM, disp_msg);
        itimer.it_value = itimer.it_interval = wait;

-       setitimer(ITIMER_REAL, &itimer, (struct timerval *)0);
+       setitimer(ITIMER_REAL, &itimer, (struct itimerval *)0);

 }
 
 end_msgs()
 }
 
 end_msgs()


@@ -49,5 +50,5 @@ end_msgs()
        signal(SIGALRM, SIG_IGN);
        timerclear(&itimer.it_value);
        timerclear(&itimer.it_interval);
        signal(SIGALRM, SIG_IGN);
        timerclear(&itimer.it_value);
        timerclear(&itimer.it_interval);

-       setitimer(ITIMER_REAL, &itimer, (struct timerval *)0);
+       setitimer(ITIMER_REAL, &itimer, (struct itimerval *)0);

 }
 }