Removed inclusion of <sys/types.h> and <sys/stat.h> in .c-files

since they're already included through "setup.h".
2024-12-21 23:58:49 -05:00 · 2007-02-26 04:24:26 +00:00 · 2007-02-26 04:24:26 +00:00 · c514a2a89a
commit c514a2a89a
parent e2f0580dfe
31 changed files with 18 additions and 144 deletions
--- a/lib/connect.c
+++ b/lib/connect.c
@ -28,9 +28,6 @@
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
@ -59,9 +56,9 @@
 #include <arpa/inet.h>
 #endif
 #ifdef HAVE_STDLIB_H
-#include <stdlib.h> /* required for free() prototype, without it, this crashes
-                       on macos 68K */
-#endif
+#include <stdlib.h> /* required for free() prototype, without it, this crashes */
+#endif              /* on macos 68K */
+
 #if (defined(HAVE_FIONBIO) && defined(__NOVELL_LIBC__))
 #include <sys/filio.h>
 #endif
@ -74,7 +71,8 @@
 #include <inet.h>
 #endif

-#endif
+#endif  /* !WIN32 */
+
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
--- a/lib/dict.c
+++ b/lib/dict.c
@ -31,12 +31,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif

 #ifdef WIN32
 #include <time.h>
--- a/lib/easy.c
+++ b/lib/easy.c
@ -29,13 +29,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
 #include <errno.h>

 #include "strequal.h"
--- a/lib/file.c
+++ b/lib/file.c
@ -30,12 +30,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif

 #ifdef WIN32
 #include <time.h>
--- a/lib/formdata.c
+++ b/lib/formdata.c
@ -112,9 +112,6 @@ Content-Disposition: form-data; name="FILECONTENT"
 #include <string.h>
 #include <stdarg.h>
 #include <time.h>
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 #if defined(HAVE_LIBGEN_H) && defined(HAVE_BASENAME)
 #include <libgen.h>
 #endif
--- a/lib/ftp.c
+++ b/lib/ftp.c
@ -34,13 +34,10 @@
 #include <unistd.h>
 #endif

-#ifdef WIN32
-
-#else /* probably some kind of unix */
+#ifndef WIN32
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
-#include <sys/types.h>
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
@ -57,7 +54,7 @@
 #include <in.h>
 #include <inet.h>
 #endif
-#endif
+#endif  /* !WIN32 */

 #if (defined(NETWARE) && defined(__NOVELL_LIBC__))
 #undef in_addr_t
--- a/lib/gtls.c
+++ b/lib/gtls.c
@ -37,9 +37,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
--- a/lib/hostares.c
+++ b/lib/hostares.c
@ -28,9 +28,6 @@
 #ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
--- a/lib/hostasyn.c
+++ b/lib/hostasyn.c
@ -28,9 +28,6 @@
 #ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
--- a/lib/hostip.c
+++ b/lib/hostip.c
@ -28,9 +28,6 @@
 #ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
--- a/lib/hostip4.c
+++ b/lib/hostip4.c
@ -29,9 +29,6 @@
 #ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
--- a/lib/hostip6.c
+++ b/lib/hostip6.c
@ -28,9 +28,6 @@
 #ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
--- a/lib/hostsyn.c
+++ b/lib/hostsyn.c
@ -28,9 +28,6 @@
 #ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
--- a/lib/hostthre.c
+++ b/lib/hostthre.c
@ -29,9 +29,6 @@
 #ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
--- a/lib/http.c
+++ b/lib/http.c
@ -30,12 +30,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif

 #ifdef WIN32
 #include <time.h>
--- a/lib/inet_ntop.c
+++ b/lib/inet_ntop.c
@ -25,9 +25,6 @@
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
--- a/lib/inet_pton.c
+++ b/lib/inet_pton.c
@ -23,9 +23,6 @@
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
--- a/lib/ldap.c
+++ b/lib/ldap.c
@ -30,12 +30,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 #ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
--- a/lib/mprintf.c
+++ b/lib/mprintf.c
@ -31,7 +31,6 @@


 #include "setup.h"
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
--- a/lib/multi.c
+++ b/lib/multi.c
@ -22,12 +22,10 @@
 ***************************************************************************/

 #include "setup.h"
+
 #include <stdlib.h>
 #include <string.h>

-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
--- a/lib/netrc.c
+++ b/lib/netrc.c
@ -27,9 +27,6 @@
 #include <stdlib.h>
 #include <string.h>

-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
--- a/lib/nss.c
+++ b/lib/nss.c
@ -31,9 +31,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
--- a/lib/select.c
+++ b/lib/select.c
@ -25,9 +25,6 @@

 #include <errno.h>

-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
--- a/lib/sendf.c
+++ b/lib/sendf.c
@ -28,10 +28,6 @@
 #include <stdlib.h>
 #include <errno.h>

-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h> /* required for send() & recv() prototypes */
 #endif
--- a/lib/ssh.c
+++ b/lib/ssh.c
@ -44,24 +44,14 @@
 #include <fcntl.h>
 #endif

-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
 #ifdef HAVE_TIME_H
 #include <time.h>
 #endif

-#ifdef WIN32
-
-#else /* probably some kind of unix */
+#ifndef WIN32
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
-#include <sys/types.h>
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
@ -78,7 +68,7 @@
 #include <in.h>
 #include <inet.h>
 #endif
-#endif
+#endif /* !WIN32 */

 #if (defined(NETWARE) && defined(__NOVELL_LIBC__))
 #undef in_addr_t
--- a/lib/sslgen.c
+++ b/lib/sslgen.c
@ -38,12 +38,10 @@
 */

 #include "setup.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@ -36,9 +36,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
--- a/lib/telnet.c
+++ b/lib/telnet.c
@ -30,12 +30,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif

 #if defined(WIN32)
 #include <time.h>
@ -65,8 +59,7 @@
 #include <sys/param.h>
 #endif

-
-#endif
+#endif  /* WIN32 */

 #include "urldata.h"
 #include <curl/curl.h>
--- a/lib/tftp.c
+++ b/lib/tftp.c
@ -30,12 +30,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif

 #if defined(WIN32)
 #include <time.h>
@ -65,8 +59,7 @@
 #include <sys/param.h>
 #endif

-
-#endif
+#endif /* WIN32 */

 #include "urldata.h"
 #include <curl/curl.h>
--- a/lib/transfer.c
+++ b/lib/transfer.c
@ -29,13 +29,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
 #include <errno.h>

 #include "strtoofft.h"
@ -81,7 +74,7 @@
 #error "We can't compile without socket() support!"
 #endif

-#endif
+#endif  /* WIN32 */

 #include "urldata.h"
 #include <curl/curl.h>
--- a/lib/url.c
+++ b/lib/url.c
@ -30,12 +30,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 #include <errno.h>

 #ifdef WIN32
@ -78,7 +72,8 @@
 #ifndef HAVE_SOCKET
 #error "We can't compile without socket() support!"
 #endif
-#endif
+
+#endif  /* WIN32 */

 #ifdef USE_LIBIDN
 #include <idna.h>