system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

resolv: Remove BIND_UPDATE preprocessor conditionals

Browse Source
This commit is contained in:
Florian Weimer 2016-04-28 11:23:52 +02:00
parent 283952c4a8
commit 561905e137
2 changed files with 5 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2016-04-28 Florian Weimer <fweimer@redhat.com>
* resolv/res_data.c: Remove code conditional on BIND_UPDATE. It
is never defined.
2016-04-28 Florian Weimer <fweimer@redhat.com>
* inet/inet_lnaof.c: Remove SCSS keyword.

36
resolv/res_data.c
View File

@ -27,9 +27,6 @@
#include <ctype.h>
#include <netdb.h>
#include <resolv.h>
#ifdef BIND_UPDATE
#include <res_update.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -55,15 +52,6 @@ const char *_res_opcodes[] = {
};
libresolv_hidden_data_def (_res_opcodes)
#ifdef BIND_UPDATE
const char *_res_sectioncodes[] attribute_hidden = {
"ZONE",
"PREREQUISITES",
"UPDATE",
"ADDITIONAL",
};
#endif
#ifndef __BIND_NOSTATIC
void
p_query(const u_char *msg) {
@ -104,18 +92,6 @@ res_mkquery(int op, /* opcode of query */
newrr_in, buf, buflen));
}
#ifdef BIND_UPDATE
int
res_mkupdate(ns_updrec *rrecp_in, u_char *buf, int buflen) {
if (__res_maybe_init (&_res, 1) == -1) {
RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
return (-1);
}
return (res_nmkupdate(&_res, rrecp_in, buf, buflen));
}
#endif
int
res_query(const char *name, /* domain name */
int class, int type, /* class and type of query */
@ -171,18 +147,6 @@ res_close(void) {
__res_iclose(&_res, false);
}
#ifdef BIND_UPDATE
int
res_update(ns_updrec *rrecp_in) {
if (__res_maybe_init (&_res, 1) == -1) {
RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
return (-1);
}
return (res_nupdate(&_res, rrecp_in, NULL));
}
#endif
int
res_search(const char *name, /* domain name */
int class, int type, /* class and type of query */