Review from Wouter

- Remove RoRi
- %d i.s.o. %x typo in ldns_rdf2buffer_str_ilnp64

diff --git a/host2str.c b/host2str.c
index bffae2fd9f64e4833de15907c72e6566d1e061de..f8a3760be410b59b481dd57b5ff0f66a4d1d4f06 100644 (file)
--- a/host2str.c
+++ b/host2str.c
@@ -1052,7 +1052,7 @@ ldns_rdf2buffer_str_tsig(ldns_buffer *output, const ldns_rdf *rdf)
 ldns_status
 ldns_rdf2buffer_str_ilnp64(ldns_buffer *output, const ldns_rdf *rdf)
 {
-       ldns_buffer_printf(output,"%.4x:%.4x:%.4d:%.4x",
+       ldns_buffer_printf(output,"%.4x:%.4x:%.4x:%.4x",
                                ldns_read_uint16(ldns_rdf_data(rdf)),
                                ldns_read_uint16(ldns_rdf_data(rdf)+2),
                                ldns_read_uint16(ldns_rdf_data(rdf)+4),

diff --git a/net.c b/net.c
index 6b444da677bc1d85a054562d91975a3205b86d29..723d006408f5760be73b9a7ee83c0d97967a1a00 100644 (file)
--- a/net.c
+++ b/net.c
@@ -834,8 +834,8 @@ ldns_axfr_start(ldns_resolver *resolver, ldns_rdf *domain, ldns_rr_class class)
                                            ldns_resolver_tsig_keydata(resolver),
                                            300, ldns_resolver_tsig_algorithm(resolver), NULL);
                if (status != LDNS_STATUS_OK) {
-                       /* RoRi: to prevent problems on subsequent calls to ldns_axfr_start
-                          we have to close the socket here! */
+                       /* to prevent problems on subsequent calls to 
+                        * ldns_axfr_start we have to close the socket here! */
 #ifndef USE_WINSOCK
                        close(resolver->_socket);
 #else
@@ -873,8 +873,8 @@ ldns_axfr_start(ldns_resolver *resolver, ldns_rdf *domain, ldns_rr_class class)
                ldns_buffer_free(query_wire);
                 LDNS_FREE(ns);
 
-               /* RoRi: to prevent problems on subsequent calls to ldns_axfr_start
-                   we have to close the socket here! */
+               /* to prevent problems on subsequent calls to ldns_axfr_start
+                * we have to close the socket here! */
 #ifndef USE_WINSOCK
                close(resolver->_socket);
 #else
@@ -891,8 +891,8 @@ ldns_axfr_start(ldns_resolver *resolver, ldns_rdf *domain, ldns_rr_class class)
                 ldns_buffer_free(query_wire);
                 LDNS_FREE(ns);
 
-               /* RoRi: to prevent problems on subsequent calls to ldns_axfr_start
-                        we have to close the socket here! */
+               /* to prevent problems on subsequent calls to ldns_axfr_start
+                * we have to close the socket here! */
 
 #ifndef USE_WINSOCK
                close(resolver->_socket);

diff --git a/resolver.c b/resolver.c
index dc1f77cbb1306adabc5b40672674ff8fc5d2ee3c..27aa54e26470434d0de596f8b088b482b6a8a3c6 100644 (file)
--- a/resolver.c
+++ b/resolver.c
@@ -1288,7 +1288,7 @@ ldns_axfr_next(ldns_resolver *resolver)
                        /* TODO: make status return type of this function (...api change) */
                        fprintf(stderr, "Error parsing rr during AXFR: %s\n", ldns_get_errorstr_by_id(status));
 
-                       /* RoRi: we must now also close the socket, otherwise subsequent uses of the
+                       /* we must now also close the socket, otherwise subsequent uses of the
                           same resolver structure will fail because the link is still open or
                           in an undefined state */
 #ifndef USE_WINSOCK
@@ -1310,7 +1310,7 @@ ldns_axfr_next(ldns_resolver *resolver)
                                                resolver->_cur_axfr_pkt));
                        }
 
-                       /* RoRi: we must now also close the socket, otherwise subsequent uses of the
+                       /* we must now also close the socket, otherwise subsequent uses of the
                           same resolver structure will fail because the link is still open or
                           in an undefined state */
 #ifndef USE_WINSOCK
@@ -1329,10 +1329,10 @@ ldns_axfr_next(ldns_resolver *resolver)
 
 }
 
-/* RoRi: this function is needed to abort a transfer that is in progress;
- *       without it an aborted transfer will lead to the AXFR code in the
- *       library staying in an indetermined state because the socket for the
- *       AXFR is never closed
+/* this function is needed to abort a transfer that is in progress;
+ * without it an aborted transfer will lead to the AXFR code in the
+ * library staying in an indetermined state because the socket for the
+ * AXFR is never closed
  */
 void
 ldns_axfr_abort(ldns_resolver *resolver)