From 75a44b91a923e29c2c0552f9db6a81556936f53b Mon Sep 17 00:00:00 2001
From: David Lawrence <source@isc.org>
Date: Thu, 18 May 2000 17:20:15 +0000
Subject: [PATCH] isc_time_subtract() now returns isc_result_t.

Use isc_time_secondsastimet() to set a time_t variable.

Properly skip the duplicate checking loop if the boundary time is not
successfully set (this was intended before, but coded wrongly).

Removed unused variable pid_string, after I opted to not add the
unrequested ISC_LOG_PRINTPID option half way into implementing it.
---
 lib/isc/log.c | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/lib/isc/log.c b/lib/isc/log.c
index e746449853..ef5c9e9350 100644
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: log.c,v 1.31 2000/05/16 03:37:37 tale Exp $ */
+/* $Id: log.c,v 1.32 2000/05/18 17:20:15 tale Exp $ */
 
 /* Principal Authors: DCL */
 
@@ -1147,7 +1147,6 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category,
 	int syslog_level;
 	char time_string[64];
 	char level_string[24];
-	char pid_string[sizeof("[99999]")];
 	struct stat statbuf;
 	isc_boolean_t matched = ISC_FALSE;
 	isc_boolean_t printtime, printtag;
@@ -1159,6 +1158,10 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category,
 	isc_result_t result;
 
 	REQUIRE(lctx == NULL || VALID_CONTEXT(lctx));
+	REQUIRE(category != NULL && category->id < lctx->category_count);
+	REQUIRE(module != NULL && module->id < lctx->module_count);
+	REQUIRE(level != ISC_LOG_DYNAMIC);
+	REQUIRE(format != NULL);
 
 	/*
 	 * Programs can use libraries that use this logging code without
@@ -1188,14 +1191,8 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category,
 	       (lctx->logconfig->dynamic && level <= lctx->debug_level)))
 		return;
 
-	REQUIRE(category != NULL && category->id < lctx->category_count);
-	REQUIRE(module != NULL && module->id < lctx->module_count);
-	REQUIRE(level != ISC_LOG_DYNAMIC);
-	REQUIRE(format != NULL);
-
 	time_string[0]  = '\0';
 	level_string[0] = '\0';
-	pid_string[0]   = '\0';
 	lctx->buffer[0] = '\0';
 
 	LOCK(&lctx->lock);
@@ -1257,15 +1254,16 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category,
 
 		if ((channel->flags & ISC_LOG_PRINTTIME) != 0 &&
 		    time_string[0] == '\0') {
+			time_t now;
+
 			result = isc_time_now(&time);
+			if (result == ISC_R_SUCCESS)
+				result = isc_time_secondsastimet(&time, &now);
 
 			if (result == ISC_R_SUCCESS) {
-				time_t now;
 				unsigned int len;
 				struct tm *timeptr;
 
-				now = isc_time_seconds(&time);
-
 				timeptr = localtime(&now);
 				/*
 				 * Emulate syslog's time format,
@@ -1329,13 +1327,18 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category,
 				 * which fall within the duplicate_interval
 				 * range.
 				 */
-				if (isc_time_now(&oldest) != ISC_R_SUCCESS)
+				if (isc_time_now(&oldest) != ISC_R_SUCCESS ||
+				    isc_time_subtract(&oldest, &interval,
+						      &oldest) !=
+				    ISC_R_SUCCESS)
+					/*
+					 * Can't effectively do the checking
+					 * without having a valid time.
+					 */
 					message = NULL;
 				else
-					isc_time_subtract(&oldest, &interval,
-							  &oldest);
+					message =ISC_LIST_HEAD(lctx->messages);
 
-				message = ISC_LIST_HEAD(lctx->messages);
 				while (message != NULL) {
 					if (isc_time_compare(&message->time,
 							     &oldest) < 0) {