[bug-inetutils] Re: syntax-check: sc_cast_of_x_alloc_return_value

[Simon Josefsson]

More syntax-check fixes.

/Simon

>From e76fbeb29040682fafd5877ee739099c2b3f975f Mon Sep 17 00:00:00 2001
From: Simon Josefsson <address@hidden>
Date: Sat, 14 Nov 2009 14:36:17 +0100
Subject: [PATCH] Don't include getopt.h without using it.

---
 ChangeLog          |   15 +++++++++++++++
 ftpd/ftpd.c        |    1 -
 ifconfig/options.c |    1 -
 rcp/rcp.c          |    1 -
 rexecd/rexecd.c    |    1 -
 rlogind/rlogind.c  |    1 -
 rshd/rshd.c        |    1 -
 talk/talk.c        |    1 -
 telnet/main.c      |    1 -
 telnetd/telnetd.c  |    2 --
 tftpd/tftpd.c      |    1 -
 uucpd/uucpd.c      |    1 -
 whois/whois.c      |    1 -
 13 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 386ef50..0e67776 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2009-11-14  Simon Josefsson  <address@hidden>
+
+       * ftpd/ftpd.c: Don't include getopt.h without using it.
+       * whois/whois.c: Likewise.
+       * uucpd/uucpd.c: Likewise.
+       * tftpd/tftpd.c: Likewise.
+       * telnetd/telnetd.c: Likewise.
+       * telnet/main.c: Likewise.
+       * talk/talk.c: Likewise.
+       * rshd/rshd.c: Likewise.
+       * rlogind/rlogind.c: Likewise.
+       * rexecd/rexecd.c: Likewise.
+       * rcp/rcp.c: Likewise.
+       * ifconfig/options.c: Likewise.
+
 2009-11-14  Alfred M. Szmidt  <address@hidden>
 
        * bootstrap.conf (gnulib_modules): Added gnupload.
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index 3a7772d..756a118 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -81,7 +81,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <getopt.h>
 #include <limits.h>
 #include <netdb.h>
 #include <setjmp.h>
diff --git a/ifconfig/options.c b/ifconfig/options.c
index 05a2d41..82401fd 100644
--- a/ifconfig/options.c
+++ b/ifconfig/options.c
@@ -23,7 +23,6 @@
 # include <config.h>
 #endif
 
-#include <getopt.h>
 #include <stdio.h>
 #include <errno.h>
 
diff --git a/rcp/rcp.c b/rcp/rcp.c
index f8af146..e838b5e 100644
--- a/rcp/rcp.c
+++ b/rcp/rcp.c
@@ -86,7 +86,6 @@
 #include <string.h>
 #include <string.h>
 #include <unistd.h>
-#include <getopt.h>
 #ifndef HAVE_UTIMES
 # include <utime.h>            /* If we don't have utimes(), use utime(). */
 #endif
diff --git a/rexecd/rexecd.c b/rexecd/rexecd.c
index a1dd6a8..0637dbf 100644
--- a/rexecd/rexecd.c
+++ b/rexecd/rexecd.c
@@ -83,7 +83,6 @@
 #ifdef HAVE_CRYPT_H
 # include <crypt.h>
 #endif
-#include <getopt.h>
 #ifdef HAVE_SYS_SELECT_H
 # include <sys/select.h>
 #endif
diff --git a/rlogind/rlogind.c b/rlogind/rlogind.c
index 1713572..a58c53d 100644
--- a/rlogind/rlogind.c
+++ b/rlogind/rlogind.c
@@ -70,7 +70,6 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
-#include <getopt.h>
 #ifdef HAVE_SYS_SELECT_H
 # include <sys/select.h>
 #endif
diff --git a/rshd/rshd.c b/rshd/rshd.c
index c966e44..f9d819e 100644
--- a/rshd/rshd.c
+++ b/rshd/rshd.c
@@ -109,7 +109,6 @@ char *alloca ();
 #include <string.h>
 #include <syslog.h>
 #include <unistd.h>
-#include <getopt.h>
 #include <grp.h>
 #ifdef HAVE_SYS_SELECT_H
 # include <sys/select.h>
diff --git a/talk/talk.c b/talk/talk.c
index 50e77f3..0c942e7 100644
--- a/talk/talk.c
+++ b/talk/talk.c
@@ -49,7 +49,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include <getopt.h>
 #include <stdlib.h>
 
 #include "talk.h"
diff --git a/telnet/main.c b/telnet/main.c
index fd2dddf..ad12548 100644
--- a/telnet/main.c
+++ b/telnet/main.c
@@ -52,7 +52,6 @@
 
 #include <sys/types.h>
 
-#include <getopt.h>
 #include <stdlib.h>
 
 #include "ring.h"
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index 1b840da..71a7023 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -20,8 +20,6 @@
 
 #include "telnetd.h"
 
-#include <getopt.h>
-
 #ifdef HAVE_SYS_UTSNAME_H
 # include <sys/utsname.h>
 #endif
diff --git a/tftpd/tftpd.c b/tftpd/tftpd.c
index 62258ec..fdf1a23 100644
--- a/tftpd/tftpd.c
+++ b/tftpd/tftpd.c
@@ -72,7 +72,6 @@
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <getopt.h>
 #include <netdb.h>
 #include <setjmp.h>
 #include <signal.h>
diff --git a/uucpd/uucpd.c b/uucpd/uucpd.c
index 980614e..34f833b 100644
--- a/uucpd/uucpd.c
+++ b/uucpd/uucpd.c
@@ -80,7 +80,6 @@
 #  include <time.h>
 # endif
 #endif
-#include <getopt.h>
 #include <pwd.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/whois/whois.c b/whois/whois.c
index 4c22793..946f613 100644
--- a/whois/whois.c
+++ b/whois/whois.c
@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include <getopt.h>
 #include <unistd.h>
 #include <string.h>
 #include <ctype.h>
-- 
1.6.5.2