mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

removed newlines from UNEXPECTED_ERROR() messages

Browse Source
This commit is contained in:
Andreas Gustafsson
2000-02-17 19:58:59 +00:00
parent dd75e174ec
commit c0d0a59d1b
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/named/main.c
View File

@@ -238,7 +238,7 @@ create_managers() {
result = isc_taskmgr_create(ns_g_mctx, ns_g_cpus, 0, &ns_g_taskmgr);
if (result != ISC_R_SUCCESS) {
UNEXPECTED_ERROR(__FILE__, __LINE__,
"ns_taskmgr_create() failed: %s\n",
"ns_taskmgr_create() failed: %s",
isc_result_totext(result));
return (ISC_R_UNEXPECTED);
}
@@ -246,7 +246,7 @@ create_managers() {
result = isc_timermgr_create(ns_g_mctx, &ns_g_timermgr);
if (result != ISC_R_SUCCESS) {
UNEXPECTED_ERROR(__FILE__, __LINE__,
"ns_timermgr_create() failed: %s\n",
"ns_timermgr_create() failed: %s",
isc_result_totext(result));
return (ISC_R_UNEXPECTED);
}
@@ -254,7 +254,7 @@ create_managers() {
result = isc_socketmgr_create(ns_g_mctx, &ns_g_socketmgr);
if (result != ISC_R_SUCCESS) {
UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_socketmgr_create() failed: %s\n",
"isc_socketmgr_create() failed: %s",
isc_result_totext(result));
return (ISC_R_UNEXPECTED);
}

2
lib/dns/masterdump.c
View File

@@ -604,7 +604,7 @@ dump_rdataset(isc_mem_t *mctx, dns_name_t *name, dns_rdataset_t *rdataset,
if (nwritten != (size_t) r.length) {
UNEXPECTED_ERROR(__FILE__, __LINE__,
"master file write failed: %s\n",
"master file write failed: %s",
strerror(errno));
return (DNS_R_UNEXPECTED);
}

6
lib/dns/rdata.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: rdata.c,v 1.69 2000/02/03 23:43:57 halley Exp $ */
/* $Id: rdata.c,v 1.70 2000/02/17 19:58:57 gson Exp $ */
#include <config.h>
@@ -452,7 +452,7 @@ dns_rdata_fromtext(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
break;
default:
UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_lex_gettoken() failed: %s\n",
"isc_lex_gettoken() failed: %s",
isc_result_totext(result));
result = DNS_R_UNEXPECTED;
break;
@@ -1163,7 +1163,7 @@ gettoken(isc_lex_t *lexer, isc_token_t *token, isc_tokentype_t expect,
return (DNS_R_NOSPACE);
default:
UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_lex_gettoken() failed: %s\n",
"isc_lex_gettoken() failed: %s",
isc_result_totext(result));
return (DNS_R_UNEXPECTED);
}

4
lib/isc/base64.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: base64.c,v 1.6 2000/02/03 23:08:22 halley Exp $ */
/* $Id: base64.c,v 1.7 2000/02/17 19:58:58 gson Exp $ */
#include <config.h>
@@ -211,7 +211,7 @@ gettoken(isc_lex_t *lexer, isc_token_t *token, isc_tokentype_t expect,
return (ISC_R_NOSPACE);
default:
UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_lex_gettoken() failed: %s\n",
"isc_lex_gettoken() failed: %s",
isc_result_totext(result));
return (ISC_R_UNEXPECTED);
}

2
lib/isc/sockaddr.c
View File

@@ -183,7 +183,7 @@ isc_sockaddr_hash(const isc_sockaddr_t *sockaddr, isc_boolean_t address_only) {
break;
default:
UNEXPECTED_ERROR(__FILE__, __LINE__,
"unknown address family: %d\n",
"unknown address family: %d",
(int)sockaddr->type.sa.sa_family);
s = (unsigned char *)&sockaddr->type;
length = sockaddr->length;

10
lib/omapi/connection.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: connection.c,v 1.15 2000/02/03 23:14:29 halley Exp $ */
/* $Id: connection.c,v 1.16 2000/02/17 19:58:58 gson Exp $ */
/* Principal Author: Ted Lemon */
@@ -978,7 +978,7 @@ omapi_connection_putdata(omapi_object_t *c, omapi_data_t *data) {
UNEXPECTED_ERROR(__FILE__, __LINE__,
"unknown type in omapi_connection_putdata: "
"%d\n", data->type);
"%d", data->type);
return (ISC_R_UNEXPECTED);
}
@@ -1070,9 +1070,9 @@ connection_destroy(omapi_object_t *handle) {
if (connection->state == omapi_connection_connected) {
UNEXPECTED_ERROR(__FILE__, __LINE__,
"Unexpected path to connection_destroy\n"
"The connection object was dereferenced "
"without a previous disconnect.\n");
"Unexpected path to connection_destroy - "
"the connection object was dereferenced "
"without a previous disconnect");
omapi_connection_disconnect(handle, OMAPI_FORCE_DISCONNECT);
}
}

4
lib/omapi/data.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: data.c,v 1.8 2000/02/03 23:14:30 halley Exp $ */
/* $Id: data.c,v 1.9 2000/02/17 19:58:59 gson Exp $ */
/* Principal Author: Ted Lemon */
@@ -72,7 +72,7 @@ omapi_data_create(omapi_data_t **t, omapi_datatype_t type, ...) {
break;
default:
UNEXPECTED_ERROR(__FILE__, __LINE__,
"unknown type in omapi_data_create: %d\n",
"unknown type in omapi_data_create: %d",
type);
return (ISC_R_UNEXPECTED);
}

2
lib/omapi/protocol.c
View File

@@ -603,7 +603,7 @@ dispatch_messages(omapi_protocol_t *protocol,
default:
UNEXPECTED_ERROR(__FILE__, __LINE__, "unknown state in "
"omapi_protocol_signal_handler: %d\n",
"omapi_protocol_signal_handler: %d",
protocol->state);
result = ISC_R_UNEXPECTED;
break;