From c1422e5b7cdb4400f934c91bcefa3a1a96d789fb Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 9 Oct 1999 21:56:43 +0000 Subject: Update. Patch by khendricks@ivey.uwo.ca [libc/1382]. --- inet/aliases.h | 25 ++++++++++++------------- inet/netinet/ether.h | 26 +++++++++++++------------- inet/netinet/in.h | 13 ++++++++----- 3 files changed, 33 insertions(+), 31 deletions(-) (limited to 'inet') diff --git a/inet/aliases.h b/inet/aliases.h index 8c47fe50c6..b050514143 100644 --- a/inet/aliases.h +++ b/inet/aliases.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -37,28 +37,27 @@ struct aliasent /* Open alias data base files. */ -extern void setaliasent __P ((void)); +extern void setaliasent (void) __THROW; /* Close alias data base files. */ -extern void endaliasent __P ((void)); +extern void endaliasent (void) __THROW; /* Get the next entry from the alias data base. */ -extern struct aliasent *getaliasent __P ((void)); +extern struct aliasent *getaliasent (void) __THROW; /* Get the next entry from the alias data base and put it in RESULT_BUF. */ -extern int getaliasent_r __P ((struct aliasent *__restrict __result_buf, - char *__restrict __buffer, - size_t __buflen, - struct aliasent **__restrict __result)); +extern int getaliasent_r (struct aliasent *__restrict __result_buf, + char *__restrict __buffer, size_t __buflen, + struct aliasent **__restrict __result) __THROW; /* Get alias entry corresponding to NAME. */ -extern struct aliasent *getaliasbyname __P ((__const char *__name)); +extern struct aliasent *getaliasbyname (__const char *__name) __THROW; /* Get alias entry corresponding to NAME and put it in RESULT_BUF. */ -extern int getaliasbyname_r __P ((__const char *__restrict __name, - struct aliasent *__restrict __result_buf, - char *__restrict __buffer, size_t __buflen, - struct aliasent **__restrict __result)); +extern int getaliasbyname_r (__const char *__restrict __name, + struct aliasent *__restrict __result_buf, + char *__restrict __buffer, size_t __buflen, + struct aliasent **__restrict __result) __THROW; __END_DECLS diff --git a/inet/netinet/ether.h b/inet/netinet/ether.h index c7985d7acc..b4f9deac11 100644 --- a/inet/netinet/ether.h +++ b/inet/netinet/ether.h @@ -1,5 +1,5 @@ /* Functions for storing Ethernet addresses in ASCII and mapping to hostnames. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -28,26 +28,26 @@ __BEGIN_DECLS /* Convert 48 bit Ethernet ADDRess to ASCII. */ -extern char *ether_ntoa __P ((__const struct ether_addr *__addr)); -extern char *ether_ntoa_r __P ((__const struct ether_addr *__addr, - char *__buf)); +extern char *ether_ntoa (__const struct ether_addr *__addr) __THROW; +extern char *ether_ntoa_r (__const struct ether_addr *__addr, char *__buf) + __THROW; /* Convert ASCII string S to 48 bit Ethernet address. */ -extern struct ether_addr *ether_aton __P ((__const char *__asc)); -extern struct ether_addr *ether_aton_r __P ((__const char *__asc, - struct ether_addr *__addr)); +extern struct ether_addr *ether_aton (__const char *__asc) __THROW; +extern struct ether_addr *ether_aton_r (__const char *__asc, + struct ether_addr *__addr) __THROW; /* Map 48 bit Ethernet number ADDR to HOSTNAME. */ -extern int ether_ntohost __P ((char *__hostname, - __const struct ether_addr *__addr)); +extern int ether_ntohost (char *__hostname, __const struct ether_addr *__addr) + __THROW; /* Map HOSTNAME to 48 bit Ethernet address. */ -extern int ether_hostton __P ((__const char *__hostname, - struct ether_addr *__addr)); +extern int ether_hostton (__const char *__hostname, struct ether_addr *__addr) + __THROW; /* Scan LINE and set ADDR and HOSTNAME. */ -extern int ether_line __P ((__const char *__line, struct ether_addr *__addr, - char *__hostname)); +extern int ether_line (__const char *__line, struct ether_addr *__addr, + char *__hostname) __THROW; __END_DECLS diff --git a/inet/netinet/in.h b/inet/netinet/in.h index e57d9e0457..7d9f3277e5 100644 --- a/inet/netinet/in.h +++ b/inet/netinet/in.h @@ -231,10 +231,13 @@ struct ipv6_mreq this was a short-sighted decision since on different systems the types may have different representations but the values are always the same. */ -extern uint32_t ntohl __P ((uint32_t __netlong)) __attribute__ ((__const__)); -extern uint16_t ntohs __P ((uint16_t __netshort)) __attribute__ ((__const__)); -extern uint32_t htonl __P ((uint32_t __hostlong)) __attribute__ ((__const__)); -extern uint16_t htons __P ((uint16_t __hostshort)) __attribute__ ((__const__)); +extern uint32_t ntohl (uint32_t __netlong) __THROW __attribute__ ((__const__)); +extern uint16_t ntohs (uint16_t __netshort) + __THROW __attribute__ ((__const__)); +extern uint32_t htonl (uint32_t __hostlong) + __THROW __attribute__ ((__const__)); +extern uint16_t htons (uint16_t __hostshort) + __THROW __attribute__ ((__const__)); #include @@ -288,7 +291,7 @@ extern uint16_t htons __P ((uint16_t __hostshort)) __attribute__ ((__const__)); (((uint32_t *) (a))[3] == ((uint32_t *) (b))[3])) /* Bind socket to a privileged IP port. */ -extern int bindresvport __P ((int __sockfd, struct sockaddr_in *__sock_in)); +extern int bindresvport (int __sockfd, struct sockaddr_in *__sock_in) __THROW; -- cgit v1.2.3