From b31c8af1d9778ce006c7375394b5f4e5e00405bf Mon Sep 17 00:00:00 2001
From: Andreas Gustafsson <source@isc.org>
Date: Tue, 13 Mar 2001 03:04:09 +0000
Subject: [PATCH] name libisccfg logging functions consistently with other
 libisccfg functions [RT #1020]

---
 bin/named/log.c                 |  4 ++--
 lib/isccfg/include/isccfg/log.h | 14 +++++++-------
 lib/isccfg/log.c                | 12 ++++++------
 lib/isccfg/parser.c             |  6 +++---
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/bin/named/log.c b/bin/named/log.c
index 0332b6e224..2bf6049833 100644
--- a/bin/named/log.c
+++ b/bin/named/log.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.c,v 1.29 2001/03/04 21:21:21 bwelling Exp $ */
+/* $Id: log.c,v 1.30 2001/03/13 03:04:09 gson Exp $ */
 
 #include <config.h>
 
@@ -77,7 +77,7 @@ ns_log_init(isc_boolean_t safe) {
 	isc_log_setcontext(ns_g_lctx);
 	dns_log_init(ns_g_lctx);
 	dns_log_setcontext(ns_g_lctx);
-	isccfg_log_init(ns_g_lctx);
+	cfg_log_init(ns_g_lctx);
 
 	if (safe)
 		result = ns_log_setsafechannels(lcfg);
diff --git a/lib/isccfg/include/isccfg/log.h b/lib/isccfg/include/isccfg/log.h
index 9ed08a7641..9ed4c9ba68 100644
--- a/lib/isccfg/include/isccfg/log.h
+++ b/lib/isccfg/include/isccfg/log.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.h,v 1.2 2001/02/22 02:44:08 bwelling Exp $ */
+/* $Id: log.h,v 1.3 2001/03/13 03:04:08 gson Exp $ */
 
 #ifndef ISCCFG_LOG_H
 #define ISCCFG_LOG_H 1
@@ -23,17 +23,17 @@
 #include <isc/lang.h>
 #include <isc/log.h>
 
-extern isc_logcategory_t isccfg_categories[];
-extern isc_logmodule_t isccfg_modules[];
+extern isc_logcategory_t cfg_categories[];
+extern isc_logmodule_t cfg_modules[];
 
-#define ISCCFG_LOGCATEGORY_CONFIG	(&isccfg_categories[0])
+#define CFG_LOGCATEGORY_CONFIG	(&cfg_categories[0])
 
-#define ISCCFG_LOGMODULE_PARSER		(&isccfg_modules[0])
+#define CFG_LOGMODULE_PARSER		(&cfg_modules[0])
 
 ISC_LANG_BEGINDECLS
 
 void
-isccfg_log_init(isc_log_t *lctx);
+cfg_log_init(isc_log_t *lctx);
 /*
  * Make the libisccfg categories and modules available for use with the
  * ISC logging library.
@@ -41,7 +41,7 @@ isccfg_log_init(isc_log_t *lctx);
  * Requires:
  *	lctx is a valid logging context.
  *
- *	isccfg_log_init() is called only once.
+ *	cfg_log_init() is called only once.
  *
  * Ensures:
  * 	The catgories and modules defined above are available for
diff --git a/lib/isccfg/log.c b/lib/isccfg/log.c
index fc53c6ade9..c5a6686d4e 100644
--- a/lib/isccfg/log.c
+++ b/lib/isccfg/log.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.c,v 1.1 2001/02/22 02:38:23 gson Exp $ */
+/* $Id: log.c,v 1.2 2001/03/13 03:04:05 gson Exp $ */
 
 #include <config.h>
 
@@ -27,7 +27,7 @@
  * When adding a new category, be sure to add the appropriate
  * #define to <isccfg/log.h>.
  */
-isc_logcategory_t isccfg_categories[] = {
+isc_logcategory_t cfg_categories[] = {
 	{ "config", 	0 },
 	{ NULL, 	0 }
 };
@@ -36,15 +36,15 @@ isc_logcategory_t isccfg_categories[] = {
  * When adding a new module, be sure to add the appropriate
  * #define to <isccfg/log.h>.
  */
-isc_logmodule_t isccfg_modules[] = {
+isc_logmodule_t cfg_modules[] = {
 	{ "isccfg/parser",	 0 },
 	{ NULL, 		0 }
 };
 
 void
-isccfg_log_init(isc_log_t *lctx) {
+cfg_log_init(isc_log_t *lctx) {
 	REQUIRE(lctx != NULL);
 
-	isc_log_registercategories(lctx, isccfg_categories);
-	isc_log_registermodules(lctx, isccfg_modules);
+	isc_log_registercategories(lctx, cfg_categories);
+	isc_log_registermodules(lctx, cfg_modules);
 }
diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index bda9baa525..143425b7a2 100644
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: parser.c,v 1.44 2001/03/06 23:54:37 bwelling Exp $ */
+/* $Id: parser.c,v 1.45 2001/03/13 03:04:06 gson Exp $ */
 
 #include <config.h>
 
@@ -36,8 +36,8 @@
 #include <isccfg/log.h>
 
 /* Shorthand */
-#define CAT ISCCFG_LOGCATEGORY_CONFIG
-#define MOD ISCCFG_LOGMODULE_PARSER
+#define CAT CFG_LOGCATEGORY_CONFIG
+#define MOD CFG_LOGMODULE_PARSER
 
 /*
  * Pass one of these flags to parser_error() to include the