From 378f5abd5ff1e45dcc3dc68ff3dde89b47342acb Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 11 May 2001 02:35:37 +0000
Subject: [PATCH] fine tune #824

---
 lib/dns/master.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/dns/master.c b/lib/dns/master.c
index 84c4092d0b..01d8ec22f4 100644
--- a/lib/dns/master.c
+++ b/lib/dns/master.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: master.c,v 1.113 2001/05/09 07:18:38 marka Exp $ */
+/* $Id: master.c,v 1.114 2001/05/11 02:35:37 marka Exp $ */
 
 #include <config.h>
 
@@ -216,8 +216,8 @@ loadctx_destroy(dns_loadctx_t *lctx);
 	do { \
 		if (isc_lex_isfile(lexer)) \
 			(*callbacks->warn)(callbacks, \
-				"%s:%lu: file does not end with newline", \
-				source, line); \
+				"%s: file does not end with newline", \
+				source); \
 	} while (0)
 
 #define EXPECTEOL \
@@ -806,9 +806,12 @@ load(dns_loadctx_t *lctx) {
 	isc_buffer_init(&target, target_mem, target_size);
 	target_save = target;
 
+	source = isc_lex_getsourcename(lctx->lex);
 	do {
 		initialws = ISC_FALSE;
+		line = isc_lex_getsourceline(lctx->lex);
 		GETTOKEN(lctx->lex, ISC_LEXOPT_INITIALWS, &token, ISC_TRUE);
+		line = isc_lex_getsourceline(lctx->lex);
 
 		if (token.type == isc_tokentype_eof) {
 			if (read_till_eol)
@@ -838,8 +841,6 @@ load(dns_loadctx_t *lctx) {
 		if (read_till_eol)
 			continue;
 
-		line = isc_lex_getsourceline(lctx->lex);
-		source = isc_lex_getsourcename(lctx->lex);
 		if (token.type == isc_tokentype_initialws) {
 			/*
 			 * Still working on the same name.