From: Miek Gieben <miekg@NLnetLabs.nl>
Date: Mon, 28 Feb 2005 15:29:52 +0000 (+0000)
Subject: disregard negative numbers. Do we have them in DNS?
X-Git-Tag: release-0.50~345
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9825127589bb4d09c79e1ae50ae3da1faa267df;p=thirdparty%2Fldns.git

disregard negative numbers. Do we have them in DNS?
---

diff --git a/rdata.c b/rdata.c
index fb71a4a9..73ad6b1b 100644
--- a/rdata.c
+++ b/rdata.c
@@ -470,8 +470,8 @@ uint32_t
 ldns_str2period(const char *nptr, const char **endptr)
 {
 	int sign = 0;
-	long i = 0;
-	long seconds = 0;
+	uint32_t i = 0;
+	uint32_t seconds = 0;
 
 	for(*endptr = nptr; **endptr; (*endptr)++) {
 		switch (**endptr) {
@@ -482,14 +482,14 @@ ldns_str2period(const char *nptr, const char **endptr)
 				if(sign == 0) {
 					sign = -1;
 				} else {
-					return (sign == -1) ? -seconds : seconds;
+					return seconds;
 				}
 				break;
 			case '+':
 				if(sign == 0) {
 					sign = 1;
 				} else {
-					return (sign == -1) ? -seconds : seconds;
+					return seconds;
 				}
 				break;
 			case 's':
@@ -532,10 +532,12 @@ ldns_str2period(const char *nptr, const char **endptr)
 				break;
 			default:
 				seconds += i;
-				return (sign == -1) ? -seconds : seconds;
+				/* disregard signedness */
+				return seconds;
 		}
 	}
 	seconds += i;
-	return (sign == -1) ? -seconds : seconds;
+	/* disregard signedness */
+	return seconds;
 }