about summary refs log tree commit diff
path: root/inet
diff options
context:
space:
mode:
Diffstat (limited to 'inet')
-rw-r--r--inet/Makefile4
-rw-r--r--inet/aliases.h3
-rw-r--r--inet/ether_hton.c33
-rw-r--r--inet/ether_line.c28
-rw-r--r--inet/ether_ntoh.c33
-rw-r--r--inet/getnetgrent_r.c49
-rw-r--r--inet/inet_net.c3
-rw-r--r--inet/netinet/tcp.h4
8 files changed, 85 insertions, 72 deletions
diff --git a/inet/Makefile b/inet/Makefile
index dd502110a8..96f19923da 100644
--- a/inet/Makefile
+++ b/inet/Makefile
@@ -46,6 +46,8 @@ routines := ntohl ntohs htonl htons		\
 	    getaliasent_r getaliasent getaliasname getaliasname_r
 
 # No warnings about losing BSD code.
-override +gccwarn := -w
+CFLAGS-rcmd.c = -w
+CFLAGS-rexec.c = -w
+CFLAGS-ruserpass.c = -w
 
 include ../Rules
diff --git a/inet/aliases.h b/inet/aliases.h
index 94895083b7..ebf3387c72 100644
--- a/inet/aliases.h
+++ b/inet/aliases.h
@@ -24,6 +24,8 @@
 #include <sys/types.h>
 
 
+__BEGIN_DECLS
+
 /* Structure to represent one entry of the alias data base.  */
 struct aliasent
 {
@@ -57,5 +59,6 @@ extern int getaliasbyname_r __P ((__const char *__name,
 				  struct aliasent **__result));
 #endif /* reentrant */
 
+__END_DECLS
 
 #endif /* aliases.h */
diff --git a/inet/ether_hton.c b/inet/ether_hton.c
index fb62d2dab5..c4149a0616 100644
--- a/inet/ether_hton.c
+++ b/inet/ether_hton.c
@@ -1,21 +1,21 @@
 /* Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <netinet/ether.h>
 #include <netinet/if_ether.h>
@@ -35,6 +35,10 @@ struct etherent
 /* Type of the lookup function we need here.  */
 typedef int (*lookup_function) (const char *, struct etherent *, char *, int);
 
+/* The lookup function for the first entry of this service.  */
+extern int __nss_ethers_lookup (service_user **nip, const char *name,
+				void **fctp);
+
 
 int
 ether_hostton (const char *hostname, struct ether_addr *addr)
@@ -44,7 +48,6 @@ ether_hostton (const char *hostname, struct ether_addr *addr)
   service_user *nip;
   lookup_function fct;
   int no_more;
-  int result;
   enum nss_status status = NSS_STATUS_UNAVAIL;
   struct etherent etherent;
 
diff --git a/inet/ether_line.c b/inet/ether_line.c
index 1400f5ae96..9e9f7368b9 100644
--- a/inet/ether_line.c
+++ b/inet/ether_line.c
@@ -1,22 +1,24 @@
 /* Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   This file is part of the GNU C Library.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
+#include <ctype.h>
 #include <stdlib.h>
+#include <string.h>
 #include <netinet/ether.h>
 #include <netinet/if_ether.h>
 
diff --git a/inet/ether_ntoh.c b/inet/ether_ntoh.c
index 26a4e471ad..61bc0f1de6 100644
--- a/inet/ether_ntoh.c
+++ b/inet/ether_ntoh.c
@@ -1,21 +1,21 @@
 /* Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <netinet/ether.h>
 #include <netinet/if_ether.h>
@@ -36,6 +36,10 @@ struct etherent
 typedef int (*lookup_function) (const struct ether_addr *, struct etherent *,
 				char *, int);
 
+/* The lookup function for the first entry of this service.  */
+extern int __nss_ethers_lookup (service_user **nip, const char *name,
+				void **fctp);
+
 
 int
 ether_ntohost (char *hostname, const struct ether_addr *addr)
@@ -45,7 +49,6 @@ ether_ntohost (char *hostname, const struct ether_addr *addr)
   service_user *nip;
   lookup_function fct;
   int no_more;
-  int result;
   enum nss_status status = NSS_STATUS_UNAVAIL;
   struct etherent etherent;
 
diff --git a/inet/getnetgrent_r.c b/inet/getnetgrent_r.c
index 5600716d69..ffa45193a9 100644
--- a/inet/getnetgrent_r.c
+++ b/inet/getnetgrent_r.c
@@ -1,23 +1,24 @@
 /* Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   This file is part of the GNU C Library.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <libc-lock.h>
 #include <netdb.h>
+#include <stdlib.h>
 #include <string.h>
 #include "netgroup.h"
 #include "nsswitch.h"
@@ -34,11 +35,11 @@ static service_user *nip;
    kept in this structure.  */
 static struct __netgrent dataset;
 
-
 /* The lookup function for the first entry of this service.  */
 extern int __nss_netgroup_lookup (service_user **nip, const char *name,
 				  void **fctp);
 
+
 /* Set up NIP to run through the services.  If ALL is zero, use NIP's
    current location if it's not nil.  Return nonzero if there are no
    services (left).  */
@@ -76,7 +77,7 @@ free_memory (struct __netgrent *data)
     {
       struct name_list *tmp = data->known_groups;
       data->known_groups = data->known_groups->next;
-      free (tmp->name);
+      free ((void *) tmp->name);
       free (tmp);
     }
 
@@ -84,7 +85,7 @@ free_memory (struct __netgrent *data)
     {
       struct name_list *tmp = data->needed_groups;
       data->needed_groups = data->needed_groups->next;
-      free (tmp->name);
+      free ((void *) tmp->name);
       free (tmp);
     }
 }
@@ -113,7 +114,7 @@ __internal_setnetgrent_reuse (const char *group, struct __netgrent *datap)
     {
       if (new_elem != NULL)
 	free (new_elem);
-      status == NSS_STATUS_UNAVAIL;
+      status = NSS_STATUS_UNAVAIL;
     }
   else
     {
@@ -260,9 +261,9 @@ __internal_getnetgrent (char **hostp, char **userp, char **domainp,
 
   if (status == NSS_STATUS_SUCCESS)
     {
-      *hostp = datap->val.triple.host;
-      *userp = datap->val.triple.user;
-      *domainp = datap->val.triple.domain;
+      *hostp = (char *) datap->val.triple.host;
+      *userp = (char *) datap->val.triple.user;
+      *domainp = (char *) datap->val.triple.domain;
     }
 
   return status == NSS_STATUS_SUCCESS ? 1 : 0;
@@ -294,8 +295,8 @@ innetgr (const char *netgroup, const char *host, const char *user,
   int (*setfct) (const char *, struct __netgrent *);
   void (*endfct) (struct __netgrent *);
   int (*getfct) (struct __netgrent *, char *, size_t);
-  struct name_list *known;
-  struct name_list *needed;
+  struct name_list *known = NULL;
+  struct name_list *needed = NULL;
   int result = 0;
   int no_more;
   const char *current_group = netgroup;
@@ -407,14 +408,14 @@ innetgr (const char *netgroup, const char *host, const char *user,
     {
       struct name_list *tmp = known;
       known = known->next;
-      free (tmp->name);
+      free ((void *) tmp->name);
       free (tmp);
     }
   while (needed != NULL)
     {
       struct name_list *tmp = needed;
       needed = needed->next;
-      free (tmp->name);
+      free ((void *) tmp->name);
       free (tmp);
     }
 
diff --git a/inet/inet_net.c b/inet/inet_net.c
index cfaadd7949..1def607278 100644
--- a/inet/inet_net.c
+++ b/inet/inet_net.c
@@ -49,10 +49,9 @@ u_int32_t
 inet_network(cp)
 	register const char *cp;
 {
-	register u_int32_t val, base, n;
+	register u_int32_t val, base, n, i;
 	register char c;
 	u_int32_t parts[4], *pp = parts;
-	register int i;
 
 again:
 	val = 0; base = 10;
diff --git a/inet/netinet/tcp.h b/inet/netinet/tcp.h
index bc821e173e..bf12a0c609 100644
--- a/inet/netinet/tcp.h
+++ b/inet/netinet/tcp.h
@@ -43,11 +43,11 @@ struct tcphdr {
 	u_short	th_dport;		/* destination port */
 	tcp_seq	th_seq;			/* sequence number */
 	tcp_seq	th_ack;			/* acknowledgement number */
-#if BYTE_ORDER == LITTLE_ENDIAN 
+#if __BYTE_ORDER == __LITTLE_ENDIAN
 	u_char	th_x2:4,		/* (unused) */
 		th_off:4;		/* data offset */
 #endif
-#if BYTE_ORDER == BIG_ENDIAN 
+#if __BYTE_ORDER == __BIG_ENDIAN
 	u_char	th_off:4,		/* data offset */
 		th_x2:4;		/* (unused) */
 #endif
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-01 05:01:21 +0000