external symbol cleanup
Jun-ichiro itojun Hagino
itojun at iijlab.net
Thu Sep 5 09:14:10 UTC 2002
it will hide symbols that shouldn't be exported to users.
against 9.3.0 snap lib/bind.
itojun
diff -u -r bind-/dst/md5.h bind/dst/md5.h
--- bind-/dst/md5.h Thu Mar 29 15:31:32 2001
+++ bind/dst/md5.h Thu Sep 5 18:09:37 2002
@@ -78,11 +78,16 @@
int num;
} MD5_CTX;
+#define MD5_Init __MD5_Init
+#define MD5_Update __MD5_Update
+#define MD5_Final __MD5_Final
+#define MD5 __MD5
+
#ifndef NOPROTO
-void MD5_Init(MD5_CTX *c);
-void MD5_Update(MD5_CTX *c, const unsigned char *data, unsigned long len);
-void MD5_Final(unsigned char *md, MD5_CTX *c);
-unsigned char *MD5(unsigned char *d, unsigned long n, unsigned char *md);
+void MD5_Init(MD5_CTX *);
+void MD5_Update(MD5_CTX *, const unsigned char *, unsigned long);
+void MD5_Final(unsigned char *, MD5_CTX *);
+unsigned char *MD5(unsigned char *, unsigned long, unsigned char *);
#else
void MD5_Init();
void MD5_Update();
diff -u -r bind-/include/Makefile bind/include/Makefile
--- bind-/include/Makefile Thu Sep 5 13:29:12 2002
+++ bind/include/Makefile Thu Sep 5 18:12:15 2002
@@ -19,8 +19,7 @@
top_srcdir = ..
-HEADERS=fd_setsize.h hesiod.h irp.h irs.h netdb.h netgroup.h res_update.h \
- resolv.h
+HEADERS=hesiod.h irp.h netdb.h netgroup.h resolv.h
AHEADERS= arpa/inet.h arpa/nameser.h arpa/nameser_compat.h
IHEADERS= isc/assertions.h isc/ctl.h isc/dst.h isc/eventlib.h isc/heap.h \
isc/irpmarshall.h isc/list.h isc/logging.h isc/memcluster.h \
@@ -210,9 +209,6 @@
install:: installdirs
for i in ${HEADERS}; do \
${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}; \
- done
- for i in ${IHEADERS}; do \
- ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/isc; \
done
for i in ${AHEADERS}; do \
${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/arpa; \
diff -u -r bind-/include/irp.h bind/include/irp.h
--- bind-/include/irp.h Thu Mar 29 15:31:34 2001
+++ bind/include/irp.h Thu Sep 5 17:30:38 2002
@@ -75,25 +75,32 @@
#define IRPD_GETNETGR_SETOK 275
#define IRPD_GETNETGR_SETERR 276
+/*
+ * Hide external function names from POSIX.
+ */
#define irs_irp_read_body __irs_irp_read_body
#define irs_irp_read_response __irs_irp_read_response
#define irs_irp_disconnect __irs_irp_disconnect
#define irs_irp_connect __irs_irp_connect
+#define irs_irp_is_connected __irs_irp_is_connected
#define irs_irp_connection_setup __irs_irp_connection_setup
#define irs_irp_send_command __irs_irp_send_command
+#define irs_irp_get_full_response __irs_irp_get_full_response
+#define irs_irp_read_line __irs_irp_read_line
struct irp_p;
-char *irs_irp_read_body(struct irp_p *pvt, size_t *size);
-int irs_irp_read_response(struct irp_p *pvt, char *text, size_t len);
-void irs_irp_disconnect(struct irp_p *pvt);
-int irs_irp_connect(struct irp_p *pvt);
-int irs_irp_is_connected(struct irp_p *pvt);
-int irs_irp_connection_setup(struct irp_p *cxndata, int *warned);
-int irs_irp_send_command(struct irp_p *pvt, const char *fmt, ...);
-int irs_irp_get_full_response(struct irp_p *pvt, int *code, char *text,
- size_t textlen, char **body,
- size_t *bodylen);
-int irs_irp_read_line(struct irp_p *pvt, char *buffer, int len);
+char *irs_irp_read_body(struct irp_p *, size_t *);
+int irs_irp_read_response(struct irp_p *, char *text, size_t len);
+void irs_irp_disconnect(struct irp_p *);
+int irs_irp_connect(struct irp_p *);
+int irs_irp_is_connected(struct irp_p *);
+int irs_irp_connection_setup(struct irp_p *, int *);
+int irs_irp_send_command(struct irp_p *, const char *, ...)
+ __attribute__((__format__(__printf__, 2, 3)));
+int irs_irp_get_full_response(struct irp_p *, int *, char *,
+ size_t, char **,
+ size_t *);
+int irs_irp_read_line(struct irp_p *, char *, int);
#endif
diff -u -r bind-/include/irs.h bind/include/irs.h
--- bind-/include/irs.h Fri Jun 22 14:10:58 2001
+++ bind/include/irs.h Thu Sep 5 16:48:29 2002
@@ -198,6 +198,38 @@
#define irs_dns_acc __irs_dns_acc
#define irs_nis_acc __irs_nis_acc
#define irs_irp_acc __irs_irp_acc
+#define irs_destroy __irs_destroy
+
+#define endhostent_p __endhostent_p
+#define gethostbyaddr_p __gethostbyaddr_p
+#define gethostbyname2_p __gethostbyname2_p
+#define gethostbyname_p __gethostbyname_p
+#define gethostent_p __gethostent_p
+#define sethostent_p __sethostent_p
+#define endnetent_p __endnetent_p
+#define getnetbyaddr_p __getnetbyaddr_p
+#define getnetbyname_p __getnetbyname_p
+#define getnetent_p __getnetent_p
+#define setnetent_p __setnetent_p
+#define endnetgrent_p __endnetgrent_p
+#define getnetgrent_p __getnetgrent_p
+#define innetgr_p __innetgr_p
+#define setnetgrent_p __setnetgrent_p
+#define endprotoent_p __endprotoent_p
+#define getprotobyname_p __getprotobyname_p
+#define getprotobynumber_p __getprotobynumber_p
+#define getprotoent_p __getprotoent_p
+#define setprotoent_p __setprotoent_p
+#define endservent_p __endservent_p
+#define getservbyname_p __getservbyname_p
+#define getservbyport_p __getservbyport_p
+#define getservent_p __getservent_p
+#define setservent_p __setservent_p
+#define res_ourserver_p __res_ourserver_p
+
+#define net_data_create __net_data_create
+#define net_data_init __net_data_init
+#define net_data_destroy __net_data_destroy
/*
* Externs.
@@ -228,102 +260,102 @@
* the default interface will use net_data_create by default. Servers will
* probably want net_data_init (one call per client)
*/
-struct net_data *net_data_create(const char *conf_file);
-struct net_data *net_data_init(const char *conf_file);
-void net_data_destroy(void *p);
+struct net_data *net_data_create(const char *);
+struct net_data *net_data_init(const char *);
+void net_data_destroy(void *);
-extern struct group *getgrent_p __P((struct net_data *net_data));
-extern struct group *getgrnam_p __P((const char *name,
- struct net_data *net_data));
-extern struct group *getgrgid_p __P((gid_t gid,
- struct net_data *net_data));
-extern int setgroupent_p __P((int stayopen,
- struct net_data *net_data));
-extern void endgrent_p __P((struct net_data *net_data));
-extern int getgrouplist_p __P((const char *name,
- gid_t basegid,
- gid_t *groups,
- int *ngroups,
- struct net_data *net_data));
+extern struct group *getgrent_p __P((struct net_data *));
+extern struct group *getgrnam_p __P((const char *,
+ struct net_data *));
+extern struct group *getgrgid_p __P((gid_t,
+ struct net_data *));
+extern int setgroupent_p __P((int,
+ struct net_data *));
+extern void endgrent_p __P((struct net_data *));
+extern int getgrouplist_p __P((const char *,
+ gid_t,
+ gid_t *,
+ int *,
+ struct net_data *));
#ifdef SETGRENT_VOID
-extern void setgrent_p __P((struct net_data *net_data));
+extern void setgrent_p __P((struct net_data *));
#else
-extern int setgrent_p __P((struct net_data *net_data));
+extern int setgrent_p __P((struct net_data *));
#endif
-extern struct hostent *gethostbyname_p __P((const char *name,
- struct net_data *net_data));
-extern struct hostent *gethostbyname2_p __P((const char *name, int af,
- struct net_data *net_data));
-extern struct hostent *gethostbyaddr_p __P((const char *addr, int len,
- int af,
- struct net_data *net_data));
-extern struct hostent *gethostent_p __P((struct net_data *net_data));
-extern void sethostent_p __P((int stayopen,
- struct net_data *net_data));
-extern void endhostent_p __P((struct net_data *net_data));
-extern struct hostent *getipnodebyname_p __P((const char *name, int af,
- int flags, int *errp,
- struct net_data *net_data));
-extern struct hostent *getipnodebyaddr_p __P((const void *addr, size_t len,
- int af, int *errp,
- struct net_data *net_data));
-
-extern struct netent *getnetent_p __P((struct net_data *net_data));
-extern struct netent *getnetbyname_p __P((const char *name,
- struct net_data *net_data));
-extern struct netent *getnetbyaddr_p __P((unsigned long net, int type,
- struct net_data *net_data));
-extern void setnetent_p __P((int stayopen,
- struct net_data *net_data));
-extern void endnetent_p __P((struct net_data *net_data));
-
-extern void setnetgrent_p __P((const char *netgroup,
- struct net_data *net_data));
-extern void endnetgrent_p __P((struct net_data *net_data));
-extern int innetgr_p __P((const char *netgroup,
- const char *host,
- const char *user,
- const char *domain,
- struct net_data *net_data));
-extern int getnetgrent_p __P((const char **host, const char **user,
- const char **domain,
- struct net_data *net_data));
-
-extern struct protoent *getprotoent_p __P((struct net_data *net_data));
-extern struct protoent *getprotobyname_p __P((const char *name,
- struct net_data *net_data));
-extern struct protoent *getprotobynumber_p __P((int proto,
- struct net_data *net_data));
-extern void setprotoent_p __P((int stayopen,
- struct net_data *net_data));
-extern void endprotoent_p __P((struct net_data *net_data));
-
-
-extern struct passwd *getpwent_p __P((struct net_data *net_data));
-extern struct passwd *getpwnam_p __P((const char *name,
- struct net_data *net_data));
-extern struct passwd *getpwuid_p __P((uid_t uid,
- struct net_data *net_data));
-extern int setpassent_p __P((int stayopen,
- struct net_data *net_data));
-extern void endpwent_p __P((struct net_data *net_data));
+extern struct hostent *gethostbyname_p __P((const char *,
+ struct net_data *));
+extern struct hostent *gethostbyname2_p __P((const char *, int,
+ struct net_data *));
+extern struct hostent *gethostbyaddr_p __P((const char *, int,
+ int,
+ struct net_data *));
+extern struct hostent *gethostent_p __P((struct net_data *));
+extern void sethostent_p __P((int,
+ struct net_data *));
+extern void endhostent_p __P((struct net_data *));
+extern struct hostent *getipnodebyname_p __P((const char *, int,
+ int, int *,
+ struct net_data *));
+extern struct hostent *getipnodebyaddr_p __P((const void *, size_t,
+ int, int *,
+ struct net_data *));
+
+extern struct netent *getnetent_p __P((struct net_data *));
+extern struct netent *getnetbyname_p __P((const char *,
+ struct net_data *));
+extern struct netent *getnetbyaddr_p __P((unsigned long, int,
+ struct net_data *));
+extern void setnetent_p __P((int,
+ struct net_data *));
+extern void endnetent_p __P((struct net_data *));
+
+extern void setnetgrent_p __P((const char *,
+ struct net_data *));
+extern void endnetgrent_p __P((struct net_data *));
+extern int innetgr_p __P((const char *,
+ const char *,
+ const char *,
+ const char *,
+ struct net_data *));
+extern int getnetgrent_p __P((const char **, const char **,
+ const char **,
+ struct net_data *));
+
+extern struct protoent *getprotoent_p __P((struct net_data *));
+extern struct protoent *getprotobyname_p __P((const char *,
+ struct net_data *));
+extern struct protoent *getprotobynumber_p __P((int,
+ struct net_data *));
+extern void setprotoent_p __P((int,
+ struct net_data *));
+extern void endprotoent_p __P((struct net_data *));
+
+
+extern struct passwd *getpwent_p __P((struct net_data *));
+extern struct passwd *getpwnam_p __P((const char *,
+ struct net_data *));
+extern struct passwd *getpwuid_p __P((uid_t,
+ struct net_data *));
+extern int setpassent_p __P((int,
+ struct net_data *));
+extern void endpwent_p __P((struct net_data *));
#ifdef SETPWENT_VOID
-extern void setpwent_p __P((struct net_data *net_data));
+extern void setpwent_p __P((struct net_data *));
#else
-extern int setpwent_p __P((struct net_data *net_data));
+extern int setpwent_p __P((struct net_data *));
#endif
-extern struct servent *getservent_p __P((struct net_data *net_data));
-extern struct servent *getservbyname_p __P((const char *name,
- const char *proto,
- struct net_data *net_data));
-extern struct servent *getservbyport_p __P((int port, const char *proto,
- struct net_data *net_data));
-extern void setservent_p __P((int stayopen,
- struct net_data *net_data));
-extern void endservent_p __P((struct net_data *net_data));
+extern struct servent *getservent_p __P((struct net_data *));
+extern struct servent *getservbyname_p __P((const char *,
+ const char *,
+ struct net_data *));
+extern struct servent *getservbyport_p __P((int, const char *,
+ struct net_data *));
+extern void setservent_p __P((int,
+ struct net_data *));
+extern void endservent_p __P((struct net_data *));
#endif /*_IRS_H_INCLUDED*/
diff -u -r bind-/include/isc/dst.h bind/include/isc/dst.h
--- bind-/include/isc/dst.h Wed Feb 20 10:44:00 2002
+++ bind/include/isc/dst.h Thu Sep 5 17:30:50 2002
@@ -12,6 +12,37 @@
} DST_KEY;
#endif /* HAS_DST_KEY */
+/*
+ * Hide external function names from POSIX.
+ */
+#define dst_buffer_to_key __dst_buffer_to_key
+#define dst_check_algorithm __dst_check_algorithm
+#define dst_compare_keys __dst_compare_keys
+#define dst_dnskey_to_key __dst_dnskey_to_key
+#define dst_free_key __dst_free_key
+#define dst_generate_key __dst_generate_key
+#define dst_hmac_md5_init __dst_hmac_md5_init
+#define dst_init __dst_init
+#define dst_key_to_buffer __dst_key_to_buffer
+#define dst_key_to_dnskey __dst_key_to_dnskey
+#define dst_read_key __dst_read_key
+#define dst_s_build_filename __dst_s_build_filename
+#define dst_s_calculate_bits __dst_s_calculate_bits
+#define dst_s_dns_key_id __dst_s_dns_key_id
+#define dst_s_dump __dst_s_dump
+#define dst_s_filename_length __dst_s_filename_length
+#define dst_s_fopen __dst_s_fopen
+#define dst_s_get_int16 __dst_s_get_int16
+#define dst_s_get_int32 __dst_s_get_int32
+#define dst_s_id_calc __dst_s_id_calc
+#define dst_s_put_int16 __dst_s_put_int16
+#define dst_s_put_int32 __dst_s_put_int32
+#define dst_s_verify_str __dst_s_verify_str
+#define dst_sig_size __dst_sig_size
+#define dst_sign_data __dst_sign_data
+#define dst_verify_data __dst_verify_data
+#define dst_write_key __dst_write_key
+
/*
* DST Crypto API defintions
*/
diff -u -r bind-/include/isc/misc.h bind/include/isc/misc.h
--- bind-/include/isc/misc.h Thu Jun 21 17:26:05 2001
+++ bind/include/isc/misc.h Thu Sep 5 18:10:34 2002
@@ -25,9 +25,12 @@
#include <stdio.h>
#define bitncmp __bitncmp
-/*#define isc_movefile __isc_movefile */
+#define isc_movefile __isc_movefile
+#define isc_gethexstring __isc_gethexstring
+#define isc_puthexstring __isc_puthexstring
+#define isc_tohex __isc_tohex
-extern int bitncmp(const void *l, const void *r, int n);
+extern int bitncmp(const void *, const void *, int);
extern int isc_movefile(const char *, const char *);
extern int isc_gethexstring(unsigned char *, size_t, int, FILE *,
diff -u -r bind-/include/isc/tree.h bind/include/isc/tree.h
--- bind-/include/isc/tree.h Thu Mar 29 15:31:37 2001
+++ bind/include/isc/tree.h Thu Sep 5 16:44:05 2002
@@ -36,6 +36,15 @@
}
tree;
+/*
+ * Hide external function names from POSIX.
+ */
+#define tree_init __tree_init
+#define tree_srch __tree_srch
+#define tree_add __tree_add
+#define tree_delete __tree_delete
+#define tree_trav __tree_trav
+#define tree_mung __tree_mung
void tree_init __P((tree **));
tree_t tree_srch __P((tree **, int (*)(), tree_t));
@@ -43,6 +52,5 @@
int tree_delete __P((tree **, int (*)(), tree_t, void (*)()));
int tree_trav __P((tree **, int (*)()));
void tree_mung __P((tree **, void (*)()));
-
#endif /* _TREE_H_INCLUDED */
diff -u -r bind-/irs/dns.c bind/irs/dns.c
--- bind-/irs/dns.c Thu Mar 29 15:31:42 2001
+++ bind/irs/dns.c Thu Sep 5 16:31:16 2002
@@ -37,7 +37,7 @@
#include <resolv.h>
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/dns_gr.c bind/irs/dns_gr.c
--- bind-/irs/dns_gr.c Thu Mar 29 15:31:42 2001
+++ bind/irs/dns_gr.c Thu Sep 5 16:31:16 2002
@@ -46,7 +46,7 @@
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/dns_ho.c bind/irs/dns_ho.c
--- bind-/irs/dns_ho.c Fri Jun 28 15:12:42 2002
+++ bind/irs/dns_ho.c Thu Sep 5 16:31:16 2002
@@ -77,7 +77,7 @@
#include <syslog.h>
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/dns_nw.c bind/irs/dns_nw.c
--- bind-/irs/dns_nw.c Fri Jun 28 15:06:24 2002
+++ bind/irs/dns_nw.c Thu Sep 5 16:31:16 2002
@@ -39,7 +39,7 @@
#include <string.h>
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/dns_p.h bind/irs/dns_p.h
--- bind-/irs/dns_p.h Thu Mar 29 15:31:42 2001
+++ bind/irs/dns_p.h Thu Sep 5 16:37:23 2002
@@ -37,6 +37,16 @@
};
/*
+ * Hide external function names from POSIX.
+ */
+#define irs_dns_gr __irs_dns_gr
+#define irs_dns_pw __irs_dns_pw
+#define irs_dns_sv __irs_dns_sv
+#define irs_dns_pr __irs_dns_pr
+#define irs_dns_ho __irs_dns_ho
+#define irs_dns_nw __irs_dns_nw
+
+/*
* Methods.
*/
diff -u -r bind-/irs/dns_pr.c bind/irs/dns_pr.c
--- bind-/irs/dns_pr.c Tue Apr 3 15:42:22 2001
+++ bind/irs/dns_pr.c Thu Sep 5 16:31:16 2002
@@ -36,7 +36,7 @@
#include <errno.h>
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/dns_pw.c bind/irs/dns_pw.c
--- bind-/irs/dns_pw.c Thu Mar 29 15:31:42 2001
+++ bind/irs/dns_pw.c Thu Sep 5 16:31:16 2002
@@ -37,7 +37,7 @@
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/dns_sv.c bind/irs/dns_sv.c
--- bind-/irs/dns_sv.c Tue Apr 3 15:42:23 2001
+++ bind/irs/dns_sv.c Thu Sep 5 16:31:16 2002
@@ -39,7 +39,7 @@
#include <resolv.h>
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/gen.c bind/irs/gen.c
--- bind-/irs/gen.c Tue Apr 3 15:42:25 2001
+++ bind/irs/gen.c Thu Sep 5 16:31:16 2002
@@ -48,7 +48,7 @@
#include <resolv.h>
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/gen_gr.c bind/irs/gen_gr.c
--- bind-/irs/gen_gr.c Thu Jun 7 11:14:52 2001
+++ bind/irs/gen_gr.c Thu Sep 5 16:31:16 2002
@@ -40,7 +40,7 @@
#include <resolv.h>
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/gen_ho.c bind/irs/gen_ho.c
--- bind-/irs/gen_ho.c Thu Mar 29 15:31:43 2001
+++ bind/irs/gen_ho.c Thu Sep 5 16:31:16 2002
@@ -36,7 +36,7 @@
#include <string.h>
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/gen_ng.c bind/irs/gen_ng.c
--- bind-/irs/gen_ng.c Thu Mar 29 15:31:43 2001
+++ bind/irs/gen_ng.c Thu Sep 5 16:31:16 2002
@@ -34,7 +34,7 @@
#include <string.h>
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/gen_nw.c bind/irs/gen_nw.c
--- bind-/irs/gen_nw.c Thu Mar 29 15:31:44 2001
+++ bind/irs/gen_nw.c Thu Sep 5 16:31:16 2002
@@ -34,7 +34,7 @@
#include <string.h>
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/gen_p.h bind/irs/gen_p.h
--- bind-/irs/gen_p.h Thu Mar 29 15:31:44 2001
+++ bind/irs/gen_p.h Thu Sep 5 16:38:07 2002
@@ -98,10 +98,22 @@
};
/*
+ * Hide external function names from POSIX.
+ */
+#define irs_gen_acc __irs_gen_acc
+#define irs_gen_gr __irs_gen_gr
+#define irs_gen_pw __irs_gen_pw
+#define irs_gen_sv __irs_gen_sv
+#define irs_gen_pr __irs_gen_pr
+#define irs_gen_ho __irs_gen_ho
+#define irs_gen_nw __irs_gen_nw
+#define irs_gen_ng __irs_gen_ng
+
+/*
* Externs.
*/
-extern struct irs_acc * irs_gen_acc __P((const char *, const char *conf_file));
+extern struct irs_acc * irs_gen_acc __P((const char *, const char *));
extern struct irs_gr * irs_gen_gr __P((struct irs_acc *));
extern struct irs_pw * irs_gen_pw __P((struct irs_acc *));
extern struct irs_sv * irs_gen_sv __P((struct irs_acc *));
diff -u -r bind-/irs/gen_pr.c bind/irs/gen_pr.c
--- bind-/irs/gen_pr.c Thu Mar 29 15:31:44 2001
+++ bind/irs/gen_pr.c Thu Sep 5 16:31:16 2002
@@ -33,7 +33,7 @@
#include <string.h>
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/gen_pw.c bind/irs/gen_pw.c
--- bind-/irs/gen_pw.c Thu Mar 29 15:31:44 2001
+++ bind/irs/gen_pw.c Thu Sep 5 16:31:16 2002
@@ -38,7 +38,7 @@
#include <string.h>
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/gen_sv.c bind/irs/gen_sv.c
--- bind-/irs/gen_sv.c Thu Mar 29 15:31:44 2001
+++ bind/irs/gen_sv.c Thu Sep 5 16:31:16 2002
@@ -33,7 +33,7 @@
#include <string.h>
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/getaddrinfo.c bind/irs/getaddrinfo.c
--- bind-/irs/getaddrinfo.c Wed Feb 27 13:05:02 2002
+++ bind/irs/getaddrinfo.c Thu Sep 5 16:31:16 2002
@@ -100,7 +100,7 @@
#include <stdarg.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/getgrent.c bind/irs/getgrent.c
--- bind-/irs/getgrent.c Thu Apr 12 10:57:35 2001
+++ bind/irs/getgrent.c Thu Sep 5 16:31:17 2002
@@ -39,7 +39,7 @@
#include <string.h>
#include <unistd.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/gethostent.c bind/irs/gethostent.c
--- bind-/irs/gethostent.c Mon May 27 16:54:35 2002
+++ bind/irs/gethostent.c Thu Sep 5 16:31:17 2002
@@ -43,7 +43,7 @@
#include <string.h>
#include <unistd.h>
-#include <irs.h>
+#include "irs.h"
#include <isc/memcluster.h>
#include "port_after.h"
diff -u -r bind-/irs/getnetent.c bind/irs/getnetent.c
--- bind-/irs/getnetent.c Tue Apr 3 16:33:07 2001
+++ bind/irs/getnetent.c Thu Sep 5 16:31:17 2002
@@ -39,7 +39,7 @@
#include <stdlib.h>
#include <string.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/getnetgrent.c bind/irs/getnetgrent.c
--- bind-/irs/getnetgrent.c Thu Mar 29 15:31:46 2001
+++ bind/irs/getnetgrent.c Thu Sep 5 16:31:17 2002
@@ -34,7 +34,7 @@
#include <resolv.h>
#include <stdio.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/getprotoent.c bind/irs/getprotoent.c
--- bind-/irs/getprotoent.c Wed Jun 27 21:29:38 2001
+++ bind/irs/getprotoent.c Thu Sep 5 16:31:17 2002
@@ -35,7 +35,7 @@
#include <stdio.h>
#include <string.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/getpwent.c bind/irs/getpwent.c
--- bind-/irs/getpwent.c Thu Mar 29 15:31:47 2001
+++ bind/irs/getpwent.c Thu Sep 5 16:31:17 2002
@@ -37,7 +37,7 @@
#include <resolv.h>
#include <stdio.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/getservent.c bind/irs/getservent.c
--- bind-/irs/getservent.c Wed Jun 27 21:29:40 2001
+++ bind/irs/getservent.c Thu Sep 5 16:31:17 2002
@@ -35,7 +35,7 @@
#include <stdio.h>
#include <string.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/irp.c bind/irs/irp.c
--- bind-/irs/irp.c Thu Nov 1 13:00:57 2001
+++ bind/irs/irp.c Thu Sep 5 16:31:17 2002
@@ -40,8 +40,8 @@
#include <isc/memcluster.h>
-#include <irs.h>
-#include <irp.h>
+#include "irs.h"
+#include "irp.h"
#include "irs_p.h"
#include "irp_p.h"
diff -u -r bind-/irs/irp_gr.c bind/irs/irp_gr.c
--- bind-/irs/irp_gr.c Fri May 25 12:32:38 2001
+++ bind/irs/irp_gr.c Thu Sep 5 16:31:17 2002
@@ -40,8 +40,8 @@
#include <unistd.h>
#include <syslog.h>
-#include <irs.h>
-#include <irp.h>
+#include "irs.h"
+#include "irp.h"
#include <isc/memcluster.h>
#include <isc/irpmarshall.h>
diff -u -r bind-/irs/irp_ho.c bind/irs/irp_ho.c
--- bind-/irs/irp_ho.c Thu Mar 29 15:31:49 2001
+++ bind/irs/irp_ho.c Thu Sep 5 16:31:17 2002
@@ -42,8 +42,8 @@
#include <string.h>
#include <syslog.h>
-#include <irs.h>
-#include <irp.h>
+#include "irs.h"
+#include "irp.h"
#include <isc/irpmarshall.h>
#include <isc/memcluster.h>
diff -u -r bind-/irs/irp_ng.c bind/irs/irp_ng.c
--- bind-/irs/irp_ng.c Thu Mar 29 15:31:49 2001
+++ bind/irs/irp_ng.c Thu Sep 5 16:31:17 2002
@@ -30,8 +30,8 @@
#include <unistd.h>
#include <syslog.h>
-#include <irs.h>
-#include <irp.h>
+#include "irs.h"
+#include "irp.h"
#include <isc/memcluster.h>
#include <isc/irpmarshall.h>
diff -u -r bind-/irs/irp_nw.c bind/irs/irp_nw.c
--- bind-/irs/irp_nw.c Thu Mar 29 15:31:49 2001
+++ bind/irs/irp_nw.c Thu Sep 5 16:31:17 2002
@@ -43,8 +43,8 @@
#include <string.h>
#include <syslog.h>
-#include <irs.h>
-#include <irp.h>
+#include "irs.h"
+#include "irp.h"
#include <isc/irpmarshall.h>
#include <isc/memcluster.h>
diff -u -r bind-/irs/irp_p.h bind/irs/irp_p.h
--- bind-/irs/irp_p.h Thu Nov 1 13:21:15 2001
+++ bind/irs/irp_p.h Thu Sep 5 16:42:42 2002
@@ -33,6 +33,19 @@
};
/*
+ * Hide external function names from POSIX.
+ */
+#define irs_irp_acc __irs_irp_acc
+#define irs_irp_gr __irs_irp_gr
+#define irs_irp_pw __irs_irp_pw
+#define irs_irp_sv __irs_irp_sv
+#define irs_irp_pr __irs_irp_pr
+#define irs_irp_ho __irs_irp_ho
+#define irs_irp_nw __irs_irp_nw
+#define irs_irp_ng __irs_irp_ng
+#define irp_log_errors __irp_log_errors
+
+/*
* Externs.
*/
@@ -45,6 +58,7 @@
extern struct irs_nw * irs_irp_nw __P((struct irs_acc *));
extern struct irs_ng * irs_irp_ng __P((struct irs_acc *));
+#if 0
int irs_irp_connect(struct irp_p *pvt);
int irs_irp_is_connected(struct irp_p *pvt);
void irs_irp_disconnect(struct irp_p *pvt);
@@ -54,7 +68,7 @@
char *text, size_t textlen,
char **body, size_t *bodylen);
int irs_irp_send_command(struct irp_p *pvt, const char *fmt, ...) ISC_FORMAT_PRINTF(2, 3);
-
+#endif
extern int irp_log_errors;
diff -u -r bind-/irs/irp_pr.c bind/irs/irp_pr.c
--- bind-/irs/irp_pr.c Thu Mar 29 15:31:49 2001
+++ bind/irs/irp_pr.c Thu Sep 5 16:31:17 2002
@@ -34,8 +34,8 @@
#include <netdb.h>
#include <syslog.h>
-#include <irs.h>
-#include <irp.h>
+#include "irs.h"
+#include "irp.h"
#include <isc/memcluster.h>
#include <isc/irpmarshall.h>
diff -u -r bind-/irs/irp_pw.c bind/irs/irp_pw.c
--- bind-/irs/irp_pw.c Fri Jun 22 14:11:03 2001
+++ bind/irs/irp_pw.c Thu Sep 5 16:31:17 2002
@@ -41,8 +41,8 @@
#include <utmp.h>
#include <unistd.h>
-#include <irs.h>
-#include <irp.h>
+#include "irs.h"
+#include "irp.h"
#include <isc/memcluster.h>
#include <isc/irpmarshall.h>
diff -u -r bind-/irs/irp_sv.c bind/irs/irp_sv.c
--- bind-/irs/irp_sv.c Thu Mar 29 15:31:49 2001
+++ bind/irs/irp_sv.c Thu Sep 5 16:31:17 2002
@@ -38,8 +38,8 @@
#include <stdlib.h>
#include <syslog.h>
-#include <irs.h>
-#include <irp.h>
+#include "irs.h"
+#include "irp.h"
#include <isc/irpmarshall.h>
#include <isc/memcluster.h>
diff -u -r bind-/irs/irpmarshall.c bind/irs/irpmarshall.c
--- bind-/irs/irpmarshall.c Tue Apr 3 15:42:28 2001
+++ bind/irs/irpmarshall.c Thu Sep 5 16:31:17 2002
@@ -83,7 +83,7 @@
#include <assert.h>
#include <errno.h>
-#include <irs.h>
+#include "irs.h"
#include <isc/memcluster.h>
#include <isc/irpmarshall.h>
diff -u -r bind-/irs/irs_data.c bind/irs/irs_data.c
--- bind-/irs/irs_data.c Thu Nov 1 13:03:40 2001
+++ bind/irs/irs_data.c Thu Sep 5 16:31:17 2002
@@ -37,7 +37,7 @@
#include <pthread.h>
#endif
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/irs_data.h bind/irs/irs_data.h
--- bind-/irs/irs_data.h Thu Mar 29 15:31:50 2001
+++ bind/irs/irs_data.h Thu Sep 5 16:39:49 2002
@@ -56,7 +56,13 @@
};
-extern struct net_data * net_data_init(const char *conf_file);
+/*
+ * Hide external function names from POSIX.
+ */
+#define net_data_init __net_data_init
+#define net_data_minimize __net_data_minimize
+
+extern struct net_data * net_data_init(const char *);
extern void net_data_minimize(struct net_data *);
#endif /*__BIND_NOSTATIC*/
diff -u -r bind-/irs/irs_p.h bind/irs/irs_p.h
--- bind-/irs/irs_p.h Thu Mar 29 15:31:50 2001
+++ bind/irs/irs_p.h Thu Sep 5 16:40:16 2002
@@ -35,12 +35,15 @@
char * serv_aliases[IRS_SV_MAXALIASES];
};
+/*
+ * Hide external function names from POSIX.
+ */
#define irs_nul_ng __irs_nul_ng
#define map_v4v6_address __map_v4v6_address
#define make_group_list __make_group_list
#define irs_lclsv_fnxt __irs_lclsv_fnxt
-extern void map_v4v6_address(const char *src, char *dst);
+extern void map_v4v6_address(const char *, char *);
extern int make_group_list(struct irs_gr *, const char *,
gid_t, gid_t *, int *);
extern struct irs_ng * irs_nul_ng(struct irs_acc *);
diff -u -r bind-/irs/lcl.c bind/irs/lcl.c
--- bind-/irs/lcl.c Thu Mar 29 15:31:50 2001
+++ bind/irs/lcl.c Thu Sep 5 16:31:18 2002
@@ -34,7 +34,7 @@
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/lcl_gr.c bind/irs/lcl_gr.c
--- bind-/irs/lcl_gr.c Thu Mar 29 15:31:50 2001
+++ bind/irs/lcl_gr.c Thu Sep 5 16:31:18 2002
@@ -76,7 +76,7 @@
#include <string.h>
#include <unistd.h>
-#include <irs.h>
+#include "irs.h"
#include <isc/memcluster.h>
#include "irs_p.h"
diff -u -r bind-/irs/lcl_ho.c bind/irs/lcl_ho.c
--- bind-/irs/lcl_ho.c Thu Mar 29 15:31:50 2001
+++ bind/irs/lcl_ho.c Thu Sep 5 16:31:18 2002
@@ -76,7 +76,7 @@
#include <stdlib.h>
#include <string.h>
-#include <irs.h>
+#include "irs.h"
#include <isc/memcluster.h>
#include "port_after.h"
diff -u -r bind-/irs/lcl_ng.c bind/irs/lcl_ng.c
--- bind-/irs/lcl_ng.c Thu Mar 29 15:31:50 2001
+++ bind/irs/lcl_ng.c Thu Sep 5 16:31:18 2002
@@ -33,7 +33,7 @@
#include <string.h>
#include <unistd.h>
-#include <irs.h>
+#include "irs.h"
#include <isc/memcluster.h>
#include "port_after.h"
diff -u -r bind-/irs/lcl_nw.c bind/irs/lcl_nw.c
--- bind-/irs/lcl_nw.c Thu Mar 29 15:31:50 2001
+++ bind/irs/lcl_nw.c Thu Sep 5 16:31:18 2002
@@ -72,7 +72,7 @@
#include <stdlib.h>
#include <string.h>
-#include <irs.h>
+#include "irs.h"
#include <isc/memcluster.h>
#include "port_after.h"
diff -u -r bind-/irs/lcl_p.h bind/irs/lcl_p.h
--- bind-/irs/lcl_p.h Thu Mar 29 15:31:50 2001
+++ bind/irs/lcl_p.h Thu Sep 5 16:41:23 2002
@@ -35,6 +35,18 @@
};
/*
+ * Hide external function names from POSIX.
+ */
+#define irs_lcl_acc __irs_lcl_acc
+#define irs_lcl_gr __irs_lcl_gr
+#define irs_lcl_pw __irs_lcl_pw
+#define irs_lcl_sv __irs_lcl_sv
+#define irs_lcl_pr __irs_lcl_pr
+#define irs_lcl_ho __irs_lcl_ho
+#define irs_lcl_nw __irs_lcl_nw
+#define irs_lcl_ng __irs_lcl_ng
+
+/*
* Externs.
*/
diff -u -r bind-/irs/lcl_pr.c bind/irs/lcl_pr.c
--- bind-/irs/lcl_pr.c Thu Mar 29 15:31:50 2001
+++ bind/irs/lcl_pr.c Thu Sep 5 16:31:18 2002
@@ -67,7 +67,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <irs.h>
+#include "irs.h"
#include <isc/memcluster.h>
#include "port_after.h"
diff -u -r bind-/irs/lcl_pw.c bind/irs/lcl_pw.c
--- bind-/irs/lcl_pw.c Thu Mar 29 15:31:51 2001
+++ bind/irs/lcl_pw.c Thu Sep 5 16:31:18 2002
@@ -78,7 +78,7 @@
#include <unistd.h>
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/lcl_sv.c bind/irs/lcl_sv.c
--- bind-/irs/lcl_sv.c Thu Jun 21 17:26:12 2001
+++ bind/irs/lcl_sv.c Thu Sep 5 16:31:18 2002
@@ -72,7 +72,7 @@
#include <string.h>
#include <stdlib.h>
-#include <irs.h>
+#include "irs.h"
#include <isc/memcluster.h>
#include "port_after.h"
diff -u -r bind-/irs/nis.c bind/irs/nis.c
--- bind-/irs/nis.c Thu Mar 29 15:31:51 2001
+++ bind/irs/nis.c Thu Sep 5 16:31:18 2002
@@ -40,7 +40,7 @@
#include <resolv.h>
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/nis_gr.c bind/irs/nis_gr.c
--- bind-/irs/nis_gr.c Thu Mar 29 15:31:51 2001
+++ bind/irs/nis_gr.c Thu Sep 5 16:31:18 2002
@@ -83,7 +83,7 @@
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/nis_ho.c bind/irs/nis_ho.c
--- bind-/irs/nis_ho.c Wed Apr 4 14:32:23 2001
+++ bind/irs/nis_ho.c Thu Sep 5 16:31:18 2002
@@ -47,7 +47,7 @@
#include <string.h>
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/nis_ng.c bind/irs/nis_ng.c
--- bind-/irs/nis_ng.c Wed Apr 4 14:32:24 2001
+++ bind/irs/nis_ng.c Thu Sep 5 16:31:18 2002
@@ -47,7 +47,7 @@
#include <resolv.h>
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/nis_nw.c bind/irs/nis_nw.c
--- bind-/irs/nis_nw.c Wed Apr 4 14:44:15 2001
+++ bind/irs/nis_nw.c Thu Sep 5 16:31:18 2002
@@ -46,7 +46,7 @@
#include <string.h>
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/nis_p.h bind/irs/nis_p.h
--- bind-/irs/nis_p.h Thu Mar 29 15:31:52 2001
+++ bind/irs/nis_p.h Thu Sep 5 16:41:47 2002
@@ -32,6 +32,16 @@
void (*free_res) __P((void *));
};
+/*
+ * Hide external function names from POSIX.
+ */
+#define irs_nis_gr __irs_nis_gr
+#define irs_nis_pw __irs_nis_pw
+#define irs_nis_sv __irs_nis_sv
+#define irs_nis_pr __irs_nis_pr
+#define irs_nis_ho __irs_nis_ho
+#define irs_nis_nw __irs_nis_nw
+#define irs_nis_ng __irs_nis_ng
/*
* Methods.
diff -u -r bind-/irs/nis_pr.c bind/irs/nis_pr.c
--- bind-/irs/nis_pr.c Wed Apr 4 14:32:25 2001
+++ bind/irs/nis_pr.c Thu Sep 5 16:31:18 2002
@@ -44,7 +44,7 @@
#include <errno.h>
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/nis_pw.c bind/irs/nis_pw.c
--- bind-/irs/nis_pw.c Fri Apr 6 15:22:00 2001
+++ bind/irs/nis_pw.c Thu Sep 5 16:31:18 2002
@@ -48,7 +48,7 @@
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/nis_sv.c bind/irs/nis_sv.c
--- bind-/irs/nis_sv.c Wed Apr 4 14:32:27 2001
+++ bind/irs/nis_sv.c Thu Sep 5 16:31:18 2002
@@ -44,7 +44,7 @@
#include <string.h>
#include <isc/memcluster.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/irs/nul_ng.c bind/irs/nul_ng.c
--- bind-/irs/nul_ng.c Thu Mar 29 15:31:52 2001
+++ bind/irs/nul_ng.c Thu Sep 5 16:31:18 2002
@@ -37,7 +37,7 @@
#include <stdlib.h>
#include <errno.h>
-#include <irs.h>
+#include "irs.h"
#include <isc/memcluster.h>
#include "port_after.h"
diff -u -r bind-/irs/util.c bind/irs/util.c
--- bind-/irs/util.c Thu Mar 29 15:31:52 2001
+++ bind/irs/util.c Thu Sep 5 16:31:18 2002
@@ -33,7 +33,7 @@
#include <string.h>
#include <stdlib.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
diff -u -r bind-/resolv/herror.c bind/resolv/herror.c
--- bind-/resolv/herror.c Thu Jun 21 17:26:21 2001
+++ bind/resolv/herror.c Thu Sep 5 16:31:18 2002
@@ -66,7 +66,7 @@
#include <resolv.h>
#include <string.h>
#include <unistd.h>
-#include <irs.h>
+#include "irs.h"
#include "port_after.h"
#undef h_errno
More information about the bind-workers
mailing list