misc cleanups

This commit is contained in:
Mark Andrews 2003-08-14 03:22:38 +00:00
parent c98b46eded
commit e2ac00112c
5 changed files with 8 additions and 13 deletions

View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: main.c,v 1.119.2.3.2.4 2003/08/13 03:58:09 marka Exp $ */
/* $Id: main.c,v 1.119.2.3.2.5 2003/08/14 03:22:36 marka Exp $ */
#include <config.h>
@ -388,8 +388,6 @@ parse_command_line(int argc, char *argv[]) {
usage();
ns_main_earlyfatal("extra command line arguments");
}
}
static isc_result_t

View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: check.c,v 1.37.6.10 2003/08/14 02:34:15 marka Exp $ */
/* $Id: check.c,v 1.37.6.11 2003/08/14 03:22:37 marka Exp $ */
#include <config.h>
@ -110,8 +110,7 @@ check_orderent(cfg_obj_t *ent, isc_log_t *logctx) {
result = ISC_R_FAILURE;
} else if (strcasecmp(cfg_obj_asstring(obj), "fixed") == 0) {
cfg_obj_log(obj, logctx, ISC_LOG_WARNING,
"rrset-order: order 'fixed' not implemented",
cfg_obj_asstring(obj));
"rrset-order: order 'fixed' not implemented");
} else if (/* strcasecmp(cfg_obj_asstring(obj), "fixed") != 0 && */
strcasecmp(cfg_obj_asstring(obj), "random") != 0 &&
strcasecmp(cfg_obj_asstring(obj), "cyclic") != 0) {

View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: name.h,v 1.95.2.3 2003/07/25 03:31:44 marka Exp $ */
/* $Id: name.h,v 1.95.2.3.2.1 2003/08/14 03:22:38 marka Exp $ */
#ifndef DNS_NAME_H
#define DNS_NAME_H 1
@ -706,7 +706,7 @@ dns_name_clone(dns_name_t *source, dns_name_t *target);
***/
void
dns_name_fromregion(dns_name_t *name, isc_region_t *r);
dns_name_fromregion(dns_name_t *name, const isc_region_t *r);
/*
* Make 'name' refer to region 'r'.
*

View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: master.c,v 1.122.2.8.2.6 2003/08/14 00:50:18 marka Exp $ */
/* $Id: master.c,v 1.122.2.8.2.7 2003/08/14 03:22:37 marka Exp $ */
#include <config.h>
@ -2075,11 +2075,9 @@ commit(dns_rdatacallbacks_t *callbacks, dns_loadctx_t *lctx,
isc_result_t result;
char namebuf[DNS_NAME_FORMATSIZE];
void (*error)(struct dns_rdatacallbacks *, const char *, ...);
void (*warn)(struct dns_rdatacallbacks *, const char *, ...);
this = ISC_LIST_HEAD(*head);
error = callbacks->error;
warn = callbacks->warn;
if (this == NULL)
return (ISC_R_SUCCESS);

View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: name.c,v 1.127.2.7 2003/07/25 03:31:43 marka Exp $ */
/* $Id: name.c,v 1.127.2.7.2.1 2003/08/14 03:22:37 marka Exp $ */
#include <config.h>
@ -1043,7 +1043,7 @@ dns_name_clone(dns_name_t *source, dns_name_t *target) {
}
void
dns_name_fromregion(dns_name_t *name, isc_region_t *r) {
dns_name_fromregion(dns_name_t *name, const isc_region_t *r) {
unsigned char *offsets;
dns_offsets_t odata;
unsigned int len;