[ntpsec commit] Remove now-unneeded entry points for internationalized logging.

[Eric S. Raymond]

Module:    ntpsec
Branch:    master
Commit:    443a2a8272c18a7546e18d6a583370a756c2d15a
Changeset: http://git.ntpsec.org/ntpsec/commit/?id=443a2a8272c18a7546e18d6a583370a756c2d15a

Author:    Eric S. Raymond <esr at thyrsus.com>
Date:      Tue Sep 29 07:07:29 2015 -0400

Remove now-unneeded entry points for internationalized logging.

---

 lib/isc/include/isc/log.h | 44 ---------------------------------
 lib/isc/log.c             | 62 -----------------------------------------------
 lib/isc/win32/libisc.def  |  4 ---
 3 files changed, 110 deletions(-)

diff --git a/lib/isc/include/isc/log.h b/lib/isc/include/isc/log.h
index 1b8027c..d033cda 100644
--- a/lib/isc/include/isc/log.h
+++ b/lib/isc/include/isc/log.h
@@ -532,9 +532,6 @@ isc_log_usechannel(isc_logconfig_t *lcfg, const char *name,
  * Write a message to the log channels.
  *
  * Notes:
- *\li	Log messages containing natural language text should be logged with
- *	isc_log_iwrite() to allow for localization.
- *
  *\li	lctx can be NULL; this is allowed so that programs which use
  *	libraries that use the ISC logging system are not required to
  *	also use it.
@@ -632,47 +629,6 @@ isc_log_vwrite1(isc_log_t *lctx, isc_logcategory_t *category,
 
 ISC_FORMAT_PRINTF(5, 0);
 
-/*%
- * These are four internationalized versions of the isc_log_[v]write[1]
- * functions.
- *
- * The only difference is that they take arguments for a message
- * catalog, message set, and message number, all immediately preceding the
- * format argument.  The format argument becomes the default text.
- *
- * Yes, that means there are now *eight* interfaces to logging a message.
- * Sheesh.   Make the madness stop!
- */
-/*@{*/
-void
-isc_log_iwrite(isc_log_t *lctx, isc_logcategory_t *category,
-	      isc_logmodule_t *module, int level,
-	      int msgset, int message,
-	      const char *format, ...)
-ISC_FORMAT_PRINTF(7, 8);
-
-void
-isc_log_ivwrite(isc_log_t *lctx, isc_logcategory_t *category,
-		isc_logmodule_t *module, int level,
-	        int msgset, int message,
-		const char *format, va_list args)
-ISC_FORMAT_PRINTF(7, 0);
-
-void
-isc_log_iwrite1(isc_log_t *lctx, isc_logcategory_t *category,
-		isc_logmodule_t *module, int level,
-		int msgset, int message,
-		const char *format, ...)
-ISC_FORMAT_PRINTF(7, 8);
-
-void
-isc_log_ivwrite1(isc_log_t *lctx, isc_logcategory_t *category,
-		 isc_logmodule_t *module, int level,
-		 int msgset, int message,
-		 const char *format, va_list args)
-ISC_FORMAT_PRINTF(7, 0);
-/*@}*/
-
 void
 isc_log_setdebuglevel(isc_log_t *lctx, unsigned int level);
 /*%<
diff --git a/lib/isc/log.c b/lib/isc/log.c
index e1bf93c..d71105f 100644
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -886,68 +886,6 @@ isc_log_vwrite1(isc_log_t *lctx, isc_logcategory_t *category,
 }
 
 void
-isc_log_iwrite(isc_log_t *lctx, isc_logcategory_t *category,
-	       isc_logmodule_t *module, int level,
-	       int msgset, int msg,
-	       const char *format, ...)
-{
-	va_list args;
-
-	/*
-	 * Contract checking is done in isc_log_doit().
-	 */
-
-	va_start(args, format);
-	isc_log_doit(lctx, category, module, level, false,
-		     msgset, msg, format, args);
-	va_end(args);
-}
-
-void
-isc_log_ivwrite(isc_log_t *lctx, isc_logcategory_t *category,
-	       isc_logmodule_t *module, int level,
-	       int msgset, int msg,
-	       const char *format, va_list args)
-{
-	/*
-	 * Contract checking is done in isc_log_doit().
-	 */
-	isc_log_doit(lctx, category, module, level, false,
-		     msgset, msg, format, args);
-}
-
-void
-isc_log_iwrite1(isc_log_t *lctx, isc_logcategory_t *category,
-		isc_logmodule_t *module, int level,
-		int msgset, int msg,
-		const char *format, ...)
-{
-	va_list args;
-
-	/*
-	 * Contract checking is done in isc_log_doit().
-	 */
-
-	va_start(args, format);
-	isc_log_doit(lctx, category, module, level, true,
-		     msgset, msg, format, args);
-	va_end(args);
-}
-
-void
-isc_log_ivwrite1(isc_log_t *lctx, isc_logcategory_t *category,
-		 isc_logmodule_t *module, int level,
-		 int msgset, int msg,
-		 const char *format, va_list args)
-{
-	/*
-	 * Contract checking is done in isc_log_doit().
-	 */
-	isc_log_doit(lctx, category, module, level, true,
-		     msgset, msg, format, args);
-}
-
-void
 isc_log_setcontext(isc_log_t *lctx) {
 	isc_lctx = lctx;
 }
diff --git a/lib/isc/win32/libisc.def b/lib/isc/win32/libisc.def
index ad3d85b..7d964fd 100644
--- a/lib/isc/win32/libisc.def
+++ b/lib/isc/win32/libisc.def
@@ -316,10 +316,6 @@ isc_log_destroy
 isc_log_getdebuglevel
 isc_log_getduplicateinterval
 isc_log_gettag
-isc_log_ivwrite
-isc_log_ivwrite1
-isc_log_iwrite
-isc_log_iwrite1
 isc_log_modulebyname
 isc_log_opensyslog
 isc_log_registercategories