i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Applied Scott's patch to remove the duplicate definitions, thus closing

Browse Source 
bug #2237. Thanks!
* Cleaned up the file a bit (removed the _P() and fixed indentation).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28961 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-01-19 22:20:28 +00:00
parent f26379bcfd
commit b2cd5c48e7
1 changed files with 126 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/posix/netdb.h
+74 -70
View File
@@ -1,3 +1,8 @@
/*
* Copyright 2002-2009, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
/* /*
* Copyright (c) 1980, 1983, 1988, 1993 * Copyright (c) 1980, 1983, 1988, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.
@@ -106,7 +111,7 @@
#endif #endif
__BEGIN_DECLS __BEGIN_DECLS
extern int * __h_errno __P((void)); extern int * __h_errno(void);
__END_DECLS __END_DECLS
#define h_errno (*__h_errno()) #define h_errno (*__h_errno())
@@ -163,13 +168,15 @@ struct addrinfo {
* Error return codes from gethostbyname() and gethostbyaddr() * Error return codes from gethostbyname() and gethostbyaddr()
* (left in extern int h_errno). * (left in extern int h_errno).
*/ */
#define NETDB_INTERNAL -1 /* see errno */ #define NETDB_INTERNAL -1 /* see errno */
#define NETDB_SUCCESS 0 /* no problem */ #define NETDB_SUCCESS 0 /* no problem */
#define HOST_NOT_FOUND 1 /* Authoritative Answer Host not found */ #define HOST_NOT_FOUND 1 /* Authoritative Answer Host not found */
#define TRY_AGAIN 2 /* Non-Authoritive Host not found, or SERVERFAIL */ #define TRY_AGAIN 2
#define NO_RECOVERY 3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */ /* Non-Authoritive Host not found, or SERVERFAIL */
#define NO_DATA 4 /* Valid name, no data record of requested type */ #define NO_RECOVERY 3
/* Non recoverable errors, FORMERR, REFUSED, NOTIMP */
#define NO_DATA 4
/* Valid name, no data record of requested type */
#define NO_ADDRESS NO_DATA /* no address, look for MX record */ #define NO_ADDRESS NO_DATA /* no address, look for MX record */
/* /*
@@ -230,74 +237,71 @@ struct addrinfo {
__BEGIN_DECLS __BEGIN_DECLS
void endhostent __P((void)); void endhostent(void);
void endnetent __P((void)); void endnetent(void);
void endprotoent __P((void)); void endprotoent(void);
void endservent __P((void)); void endservent(void);
void freehostent __P((struct hostent *)); void freehostent(struct hostent *host);
struct hostent *gethostbyaddr __P((const char *, int, int)); struct hostent *gethostbyaddr(const char *address, int length, int type);
struct hostent *gethostbyname __P((const char *)); struct hostent *gethostbyname(const char *name);
struct hostent *gethostbyname2 __P((const char *, int)); struct hostent *gethostbyname2(const char *name, int type);
struct hostent *gethostent __P((void)); struct hostent *gethostent(void);
struct hostent *getipnodebyaddr __P((const void *, size_t, int, int *)); struct hostent *getipnodebyaddr(const void *, size_t, int, int *);
struct hostent *getipnodebyname __P((const char *, int, int, int *)); struct hostent *getipnodebyname(const char *, int, int, int *);
struct netent *getnetbyaddr __P((unsigned long, int)); struct netent *getnetbyaddr(unsigned long, int);
struct netent *getnetbyname __P((const char *)); struct netent *getnetbyname(const char *);
struct netent *getnetent __P((void)); struct netent *getnetent(void);
struct protoent *getprotobyname __P((const char *)); struct protoent *getprotobyname(const char *);
struct protoent *getprotobynumber __P((int)); struct protoent *getprotobynumber(int);
struct protoent *getprotoent __P((void)); struct protoent *getprotoent(void);
struct servent *getservbyname __P((const char *, const char *)); struct servent *getservbyname(const char *, const char *);
struct servent *getservbyport __P((int, const char *)); struct servent *getservbyport(int, const char *);
struct servent *getservent __P((void)); struct servent *getservent(void);
void herror __P((const char *)); void herror(const char *);
const char *hstrerror __P((int)); const char *hstrerror(int);
void sethostent __P((int)); void sethostent(int);
/* void sethostfile __P((const char *)); */ /* void sethostfile(const char *); */
void setnetent __P((int)); void setnetent(int);
void setprotoent __P((int)); void setprotoent(int);
void setservent __P((int)); void setservent(int);
int getaddrinfo __P((const char *, const char *, int getaddrinfo(const char *, const char *,
const struct addrinfo *, struct addrinfo **)); const struct addrinfo *, struct addrinfo **);
int getnameinfo __P((const struct sockaddr *, socklen_t, char *, int getnameinfo(const struct sockaddr *, socklen_t, char *,
socklen_t, char *, socklen_t, int)); socklen_t, char *, socklen_t, int);
void freeaddrinfo __P((struct addrinfo *)); void freeaddrinfo(struct addrinfo *);
const char *gai_strerror __P((int)); const char *gai_strerror(int);
struct hostent *getipnodebyname __P((const char *, int, int, int *));
struct hostent *getipnodebyaddr __P((const void *, size_t, int, int *));
void freehostent __P((struct hostent *));
struct hostent *gethostbyaddr_r __P((const char *, int, int, struct hostent *, struct hostent *gethostbyaddr_r(const char *, int, int, struct hostent *,
char *, int, int *)); char *, int, int *);
struct hostent *gethostbyname_r __P((const char *, struct hostent *, struct hostent *gethostbyname_r(const char *, struct hostent *,
char *, int, int *)); char *, int, int *);
struct hostent *gethostent_r __P((struct hostent *, char *, int, int *)); struct hostent *gethostent_r(struct hostent *, char *, int, int *);
void sethostent_r __P((int)); void sethostent_r(int);
void endhostent_r __P((void)); void endhostent_r(void);
struct netent *getnetbyname_r __P((const char *, struct netent *, struct netent *getnetbyname_r(const char *, struct netent *,
char *, int)); char *, int);
struct netent *getnetbyaddr_r __P((long, int, struct netent *, struct netent *getnetbyaddr_r(long, int, struct netent *,
char *, int)); char *, int);
struct netent *getnetent_r __P((struct netent *, char *, int)); struct netent *getnetent_r(struct netent *, char *, int);
void setnetent_r __P((int)); void setnetent_r(int);
void endnetent_r __P((void)); void endnetent_r(void);
struct protoent *getprotobyname_r __P((const char *, struct protoent *getprotobyname_r(const char *,
struct protoent *, char *, int)); struct protoent *, char *, int);
struct protoent *getprotobynumber_r __P((int, struct protoent *getprotobynumber_r(int,
struct protoent *, char *, int)); struct protoent *, char *, int);
struct protoent *getprotoent_r __P((struct protoent *, char *, int)); struct protoent *getprotoent_r(struct protoent *, char *, int);
void setprotoent_r __P((int)); void setprotoent_r(int);
void endprotoent_r __P((void)); void endprotoent_r(void);
struct servent *getservbyname_r __P((const char *name, const char *, struct servent *getservbyname_r(const char *name, const char *,
struct servent *, char *, int)); struct servent *, char *, int);
struct servent *getservbyport_r __P((int port, const char *, struct servent *getservbyport_r(int port, const char *,
struct servent *, char *, int)); struct servent *, char *, int);
struct servent *getservent_r __P((struct servent *, char *, int)); struct servent *getservent_r(struct servent *, char *, int);
void setservent_r __P((int)); void setservent_r(int);
void endservent_r __P((void)); void endservent_r(void);
__END_DECLS __END_DECLS
#endif /* !_NETDB_H_ */ #endif /* _NETDB_H_ */