From: Matthijs Mekking <matje@NLnetLabs.nl>
Date: Fri, 6 Jan 2012 09:57:03 +0000 (+0000)
Subject: review:
X-Git-Tag: release-1.6.12~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=977e3072a1954afc0056cfce723be29776084f0d;p=thirdparty%2Fldns.git

review:
* Fix one typo in doc
* Add a newline for layout purposes
* Rename function _YYYYMMDDxx to _datecounter
---

diff --git a/examples/ldns-read-zone.1 b/examples/ldns-read-zone.1
index 127f14e4..49cd3e58 100644
--- a/examples/ldns-read-zone.1
+++ b/examples/ldns-read-zone.1
@@ -40,7 +40,7 @@ printed.
 Set serial number to the given \fInumber\fR, or when preceded by a sign,
 offset the exisiting number with it. When giving the literal strings 
 \fIYYYYMMDDxx\fR or \fIunixtime\fR, the serial number is tried to be reset
-in date or in unixtime format respectively. Though is the updated serial
+in datecounter or in unixtime format respectively. Though is the updated serial
 number is smaller than the original one, the original one is simply
 increased by one.
 
diff --git a/examples/ldns-read-zone.c b/examples/ldns-read-zone.c
index 500e3558..ac32bac7 100644
--- a/examples/ldns-read-zone.c
+++ b/examples/ldns-read-zone.c
@@ -64,9 +64,9 @@ main(int argc, char **argv)
 						" unixtime ]\n"
 				       "\t\tSet serial number to <number> or,"
 						" when preceded by a sign,\n"
-				       "\t\toffset the exisiting number with "
+				       "\t\toffset the existing number with "
 						"<number>.  With YYYYMMDDxx\n"
-				       "\t\tthe serial is formatted as a date"
+				       "\t\tthe serial is formatted as a datecounter"
 						", and with unixtime as the\n"
 				       "\t\tnumber of seconds since 1-1-1970."
 				       		"  However, on serial number"
@@ -108,7 +108,7 @@ main(int argc, char **argv)
 						ldns_soa_serial_identity;
 				} else if (!strcasecmp(optarg, "YYYYMMDDxx")){
 					soa_serial_increment_func =
-						ldns_soa_serial_YYYYMMDDxx;
+						ldns_soa_serial_datecounter;
 				} else if (!strcasecmp(optarg, "unixtime")){
 					soa_serial_increment_func =
 						ldns_soa_serial_unixtime;
diff --git a/ldns/dnssec_verify.h b/ldns/dnssec_verify.h
index 81462bde..1350f485 100644
--- a/ldns/dnssec_verify.h
+++ b/ldns/dnssec_verify.h
@@ -222,6 +222,7 @@ ldns_status ldns_dnssec_trust_tree_add_parent(ldns_dnssec_trust_tree *tree,
 ldns_dnssec_trust_tree *ldns_dnssec_derive_trust_tree(
                             ldns_dnssec_data_chain *data_chain,
 					   ldns_rr *rr);
+
 /**
  * Generates a dnssec_trust_ttree for the given rr from the
  * given data_chain
@@ -238,7 +239,6 @@ ldns_dnssec_trust_tree *ldns_dnssec_derive_trust_tree_time(
 		ldns_dnssec_data_chain *data_chain, 
 		ldns_rr *rr, time_t check_time);
 
-
 /**
  * Sub function for derive_trust_tree that is used for a 'normal' rrset
  *
diff --git a/ldns/rr_functions.h b/ldns/rr_functions.h
index 76a1a604..3db3b3df 100644
--- a/ldns/rr_functions.h
+++ b/ldns/rr_functions.h
@@ -305,7 +305,7 @@ uint32_t ldns_soa_serial_unixtime(uint32_t s, void *data);
 /**
  * Function to be used with ldns_rr_soa_increment_func or 
  * ldns_rr_soa_increment_func_int to set the soa serial to the current date
- * succeeded by a two digit iteration.
+ * succeeded by a two digit iteration (datecounter).
  * When data is given (i.e. the function is called via
  * ldns_rr_soa_increment_func_int), it is used as the current time. 
  * When the resulting serial number is smaller than the current serial number,
@@ -313,7 +313,7 @@ uint32_t ldns_soa_serial_unixtime(uint32_t s, void *data);
  * \param[in] s the current serial number.
  * \param[in] data the time in seconds since 1-1-1970 00:00
  */
-uint32_t ldns_soa_serial_YYYYMMDDxx(uint32_t s, void *data);
+uint32_t ldns_soa_serial_datecounter(uint32_t s, void *data);
 
 /**
  * Increment the serial number of the given SOA by one.
@@ -325,7 +325,7 @@ void ldns_rr_soa_increment(
 /**
  * Increment the serial number of the given SOA with the given function.
  * Included functions to be used here are: ldns_rr_soa_increment, 
- * ldns_soa_serial_unixtime and ldns_soa_serial_YYYYMMDDxx.
+ * ldns_soa_serial_unixtime and ldns_soa_serial_datecounter.
  * \param[in] soa The soa rr to be incremented
  * \param[in] f the function to use to increment the soa rr.
  */
@@ -347,7 +347,7 @@ void ldns_rr_soa_increment_func_data(
  * using data as an argument for the function.
  * Included functions to be used here are: ldns_soa_serial_identity,
  * ldns_rr_soa_increment_by, ldns_soa_serial_unixtime and 
- * ldns_soa_serial_YYYYMMDDxx.
+ * ldns_soa_serial_datecounter.
  * \param[in] soa The soa rr to be incremented
  * \param[in] f the function to use to increment the soa rr.
  * \param[in] data this argument will be passed to f as the second argument
diff --git a/ldns_symbols.def b/ldns_symbols.def
index 6dc04b12..ced23a53 100644
--- a/ldns_symbols.def
+++ b/ldns_symbols.def
@@ -666,7 +666,7 @@ ldns_sign_public_dsa
 ldns_sign_public_evp
 ldns_sign_public_rsamd5
 ldns_sign_public_rsasha1
-ldns_soa_serial_YYYYMMDDxx
+ldns_soa_serial_datecounter
 ldns_soa_serial_identity
 ldns_soa_serial_increment
 ldns_soa_serial_increment_by
diff --git a/rr_functions.c b/rr_functions.c
index e89541b5..be8f6868 100644
--- a/rr_functions.c
+++ b/rr_functions.c
@@ -356,7 +356,7 @@ uint32_t ldns_soa_serial_increment_by(uint32_t s, void *data)
 	return s + (intptr_t) data;
 }
 
-uint32_t ldns_soa_serial_YYYYMMDDxx(uint32_t s, void *data)
+uint32_t ldns_soa_serial_datecounter(uint32_t s, void *data)
 {
 	struct tm tm;
 	char s_str[11];