coding style - dont' check linktest.c

diff --git a/net.c b/net.c
index 718c1f5b9da042b33026c296445b7aa92c5e4080..5125a679af95e29da9e3d81e75bae65d41bf41cb 100644 (file)
--- a/net.c
+++ b/net.c
@@ -49,7 +49,8 @@ ldns_send(ldns_pkt **result, ldns_resolver *r, const ldns_pkt *query_pkt)
        status = LDNS_STATUS_OK;
        rtt = ldns_resolver_rtt(r);
        ns_array = ldns_resolver_nameservers(r);
-       reply = NULL; ns_len = 0;
+       reply = NULL; 
+       ns_len = 0;
 
        all_servers_rtt_inf = true;
 
@@ -101,7 +102,10 @@ ldns_send(ldns_pkt **result, ldns_resolver *r, const ldns_pkt *query_pkt)
                /* reply_bytes implicitly handles our error */
                if (1 == ldns_resolver_usevc(r)) {
                        for (retries = ldns_resolver_retry(r); retries > 0; retries--) {
-                               send_status = ldns_tcp_send(&reply_bytes, qb, ns, (socklen_t)ns_len, ldns_resolver_timeout(r), &reply_size);
+                               send_status = 
+                                       ldns_tcp_send(&reply_bytes, qb, ns, 
+                                       (socklen_t)ns_len, ldns_resolver_timeout(r), 
+                                       &reply_size);
                                if (send_status == LDNS_STATUS_OK) {
                                        break;
                                }
@@ -109,7 +113,10 @@ ldns_send(ldns_pkt **result, ldns_resolver *r, const ldns_pkt *query_pkt)
                } else {
                        for (retries = ldns_resolver_retry(r); retries > 0; retries--) {
                                /* ldns_rdf_print(stdout, ns_array[i]); */
-                               send_status = ldns_udp_send(&reply_bytes, qb, ns, (socklen_t)ns_len, ldns_resolver_timeout(r), &reply_size);
+                               send_status = 
+                                       ldns_udp_send(&reply_bytes, qb, ns, 
+                                                       (socklen_t)ns_len, ldns_resolver_timeout(r), 
+                                                       &reply_size);
                                
                                if (send_status == LDNS_STATUS_OK) {
                                        break;
@@ -176,8 +183,7 @@ ldns_send(ldns_pkt **result, ldns_resolver *r, const ldns_pkt *query_pkt)
                                          reply_bytes,
                                          reply_size,
                                          ldns_resolver_tsig_keyname(r),
-                                         ldns_resolver_tsig_keydata(r),
-                                         tsig_mac)) {
+                                         ldns_resolver_tsig_keydata(r), tsig_mac)) {
                        status = LDNS_STATUS_CRYPTO_TSIG_BOGUS;
                }
        }
@@ -193,7 +199,8 @@ ldns_send(ldns_pkt **result, ldns_resolver *r, const ldns_pkt *query_pkt)
 }
 
 ldns_status
-ldns_udp_send(uint8_t **result, ldns_buffer *qbin, const struct sockaddr_storage *to, socklen_t tolen, struct timeval timeout, size_t *answer_size)
+ldns_udp_send(uint8_t **result, ldns_buffer *qbin, const struct sockaddr_storage *to, 
+               socklen_t tolen, struct timeval timeout, size_t *answer_size)
 {
        int sockfd;
        uint8_t *answer;
@@ -221,7 +228,8 @@ ldns_udp_send(uint8_t **result, ldns_buffer *qbin, const struct sockaddr_storage
 }
 
 int
-ldns_udp_bgsend(ldns_buffer *qbin, const struct sockaddr_storage *to, socklen_t tolen, struct timeval timeout)
+ldns_udp_bgsend(ldns_buffer *qbin, const struct sockaddr_storage *to, socklen_t tolen, 
+               struct timeval timeout)
 {
        int sockfd;
 
@@ -242,7 +250,8 @@ ldns_udp_connect(const struct sockaddr_storage *to, struct timeval timeout)
 {
        int sockfd;
        
-       if ((sockfd = socket((int)((struct sockaddr*)to)->sa_family, SOCK_DGRAM, IPPROTO_UDP)) 
+       if ((sockfd = socket((int)((struct sockaddr*)to)->sa_family, SOCK_DGRAM, 
+                                       IPPROTO_UDP)) 
                        == -1) {
                 return 0;
         }
@@ -256,11 +265,13 @@ ldns_udp_connect(const struct sockaddr_storage *to, struct timeval timeout)
 }
 
 int
-ldns_tcp_connect(const struct sockaddr_storage *to, socklen_t tolen, struct timeval timeout)
+ldns_tcp_connect(const struct sockaddr_storage *to, socklen_t tolen, 
+               struct timeval timeout)
 {
        int sockfd;
        
-       if ((sockfd = socket((int)((struct sockaddr*)to)->sa_family, SOCK_STREAM, IPPROTO_TCP)) == -1) {
+       if ((sockfd = socket((int)((struct sockaddr*)to)->sa_family, SOCK_STREAM, 
+                                       IPPROTO_TCP)) == -1) {
                perror("could not open socket");
                return 0;
        }
@@ -413,7 +424,8 @@ ldns_tcp_read_wire(int sockfd, size_t *size)
  * amount data to expect
  */
 ldns_status
-ldns_tcp_send(uint8_t **result,  ldns_buffer *qbin, const struct sockaddr_storage *to, socklen_t tolen, struct timeval timeout, size_t *answer_size)
+ldns_tcp_send(uint8_t **result,  ldns_buffer *qbin, const struct sockaddr_storage *to, 
+               socklen_t tolen, struct timeval timeout, size_t *answer_size)
 {
        int sockfd;
        uint8_t *answer;
@@ -439,7 +451,8 @@ ldns_tcp_send(uint8_t **result,  ldns_buffer *qbin, const struct sockaddr_storag
 }
 
 int
-ldns_tcp_bgsend(ldns_buffer *qbin, const struct sockaddr_storage *to, socklen_t tolen, struct timeval timeout)
+ldns_tcp_bgsend(ldns_buffer *qbin, const struct sockaddr_storage *to, socklen_t tolen, 
+               struct timeval timeout)
 {
        int sockfd;
        
@@ -507,8 +520,7 @@ ldns_sockaddr_storage2rdf(struct sockaddr_storage *sock, uint16_t *port)
                                 *port = ntohs((uint16_t)data_in->sin_port);
                         }
                         addr = ldns_rdf_new_frm_data(LDNS_RDF_TYPE_A,
-                                        LDNS_IP4ADDRLEN,
-                                        &data_in->sin_addr);
+                                        LDNS_IP4ADDRLEN, &data_in->sin_addr);
                         break;
                 case AF_INET6:
                         data_in6 = (struct sockaddr_in6*)sock;
@@ -516,8 +528,7 @@ ldns_sockaddr_storage2rdf(struct sockaddr_storage *sock, uint16_t *port)
                                 *port = ntohs((uint16_t)data_in6->sin6_port);
                         }
                         addr = ldns_rdf_new_frm_data(LDNS_RDF_TYPE_AAAA,
-                                        LDNS_IP6ADDRLEN,
-                                        &data_in6->sin6_addr);
+                                        LDNS_IP6ADDRLEN, &data_in6->sin6_addr);
                         break;
                 default:
                         if (port) {
@@ -530,9 +541,7 @@ ldns_sockaddr_storage2rdf(struct sockaddr_storage *sock, uint16_t *port)
 
 /* code from resolver.c */
 ldns_status
-ldns_axfr_start(ldns_resolver *resolver,
-                ldns_rdf *domain,
-                ldns_rr_class class)
+ldns_axfr_start(ldns_resolver *resolver, ldns_rdf *domain, ldns_rr_class class) 
 {
         ldns_pkt *query;
         ldns_buffer *query_wire;
@@ -545,10 +554,7 @@ ldns_axfr_start(ldns_resolver *resolver,
                 return LDNS_STATUS_ERR;
         }
 
-        query = ldns_pkt_query_new(ldns_rdf_clone(domain),
-                                   LDNS_RR_TYPE_AXFR,
-                                   class,
-                                   0);
+        query = ldns_pkt_query_new(ldns_rdf_clone(domain), LDNS_RR_TYPE_AXFR, class, 0);
 
         if (!query) {
                 return LDNS_STATUS_ADDRESS_ERR;
@@ -557,7 +563,8 @@ ldns_axfr_start(ldns_resolver *resolver,
         ns = ldns_rdf2native_sockaddr_storage(resolver->_nameservers[0],
                         ldns_resolver_port(resolver), &ns_len);
 
-        resolver->_socket = ldns_tcp_connect(ns, (socklen_t)ns_len, ldns_resolver_timeout(resolver));
+        resolver->_socket = ldns_tcp_connect(ns, (socklen_t)ns_len, 
+                       ldns_resolver_timeout(resolver));
         if (resolver->_socket == 0) {
                 ldns_pkt_free(query);
                 LDNS_FREE(ns);
@@ -574,7 +581,8 @@ ldns_axfr_start(ldns_resolver *resolver,
                 return status;
         }
         /* Send the query */
-        if (ldns_tcp_send_query(query_wire, resolver->_socket, ns, (socklen_t)ns_len) == 0) {
+        if (ldns_tcp_send_query(query_wire, resolver->_socket, ns, 
+                               (socklen_t)ns_len) == 0) {
                 ldns_pkt_free(query);
                 ldns_buffer_free(query_wire);
                 LDNS_FREE(ns);

diff --git a/test/codingstyle.tpkg b/test/codingstyle.tpkg
index 83734c2ade3fa16d251d90d3ea56c90eed9e9d8e..183316c2ce92809373a9485f155e2648487080a4 100644 (file)
--- a/test/codingstyle.tpkg
+++ b/test/codingstyle.tpkg
@@ -3,7 +3,7 @@
 # To extract the files from this archive, save it to some FILE, remove
 # everything before the `!/bin/sh' line above, then type `sh FILE'.
 #
-# Made on 2006-03-15 10:00 CET by <miekg@elektron>.
+# Made on 2006-03-15 10:12 CET by <miekg@elektron>.
 # Source directory was `/home/miekg/svn/libdns/trunk/test/codingstyle.dir'.
 #
 # Existing files will *not* be overwritten unless `-c' is specified.
@@ -13,7 +13,7 @@
 # ------ ---------- ------------------------------------------
 #    270 -rw------- codingstyle.dsc
 #     36 -rw------- codingstyle.help
-#   1047 -rw------- codingstyle.test
+#   1119 -rw------- codingstyle.test
 #
 save_IFS="${IFS}"
 IFS="${IFS}:"
@@ -63,7 +63,7 @@ else
 fi
 rm -f 200112312359.59 123123592001.59 123123592001.5 1231235901 $$.touch
 #
-if mkdir _sh06321; then
+if mkdir _sh07636; then
   $echo 'x -' 'creating lock directory'
 else
   $echo 'failed to create lock directory'
@@ -155,6 +155,8 @@ X        "../../util.c" | "../../host2str.c")
 X                continue;;
 X        "../../error.c" | "../../rr.c")
 X                continue;;
+X        "../../keys.c" | "../../linktest.c")
+X                continue;;
 X        esac
 X
 X        case $OSTYPE in
@@ -176,20 +178,20 @@ X        exit 1
 fi
 Xexit 0
 SHAR_EOF
-  (set 20 06 03 15 10 00 00 'codingstyle.test'; eval "$shar_touch") &&
+  (set 20 06 03 15 10 12 38 'codingstyle.test'; eval "$shar_touch") &&
   chmod 0600 'codingstyle.test' ||
   $echo 'restore of' 'codingstyle.test' 'failed'
   if ( md5sum --help 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
   && ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
     md5sum -c << SHAR_EOF >/dev/null 2>&1 \
     || $echo 'codingstyle.test:' 'MD5 check failed'
-e0be0c5e8fe0bde45d4deb10983aadb7  codingstyle.test
+a7199cb299797001f5e5d0121b2d97a7  codingstyle.test
 SHAR_EOF
   else
     shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < 'codingstyle.test'`"
-    test 1047 -eq "$shar_count" ||
-    $echo 'codingstyle.test:' 'original size' '1047,' 'current size' "$shar_count!"
+    test 1119 -eq "$shar_count" ||
+    $echo 'codingstyle.test:' 'original size' '1119,' 'current size' "$shar_count!"
   fi
 fi
-rm -fr _sh06321
+rm -fr _sh07636
 exit 0