ignore more files: all coding stuff there is length related

open's indent might think differently

diff --git a/dnssec.c b/dnssec.c
index bdd5c2a55c1048e3c1d9104be81fd0c7e2af22f5..92acf2a1dbc97508017c63f5bcf4d9d15925004e 100644 (file)
--- a/dnssec.c
+++ b/dnssec.c
@@ -1309,7 +1309,8 @@ ldns_zone_sign(ldns_zone *zone, ldns_key_list *key_list)
  * apps must call this 
  */
 ldns_status 
-ldns_init_random(FILE *fd, uint16_t bytes) {
+ldns_init_random(FILE *fd, uint16_t bytes) 
+{
        FILE *rand;
        uint8_t *buf;
 

diff --git a/host2wire.c b/host2wire.c
index 660a876d35d5049753e8729ecdb40c6dff7c3925..b2a836de1b39d6117b988e5ecf0567daf18cbd57 100644 (file)
--- a/host2wire.c
+++ b/host2wire.c
@@ -27,9 +27,7 @@ ldns_status
 ldns_dname2buffer_wire(ldns_buffer *buffer, const ldns_rdf *name)
 {
        if (ldns_buffer_reserve(buffer, ldns_rdf_size(name))) {
-               ldns_buffer_write(buffer,
-                                 ldns_rdf_data(name),
-                                 ldns_rdf_size(name));
+               ldns_buffer_write(buffer, ldns_rdf_data(name), ldns_rdf_size(name));
        }
        return ldns_buffer_status(buffer);
 }
@@ -38,9 +36,7 @@ ldns_status
 ldns_rdf2buffer_wire(ldns_buffer *buffer, const ldns_rdf *rdf)
 {
        if (ldns_buffer_reserve(buffer, ldns_rdf_size(rdf))) {
-               ldns_buffer_write(buffer,
-                                 ldns_rdf_data(rdf),
-                                 ldns_rdf_size(rdf));
+               ldns_buffer_write(buffer, ldns_rdf_data(rdf), ldns_rdf_size(rdf));
        }
        return ldns_buffer_status(buffer);
 }
@@ -54,7 +50,8 @@ ldns_rr_list2buffer_wire(ldns_buffer *buffer,const ldns_rr_list *rr_list)
 
        rr_count = ldns_rr_list_rr_count(rr_list);
        for(i = 0; i < rr_count; i++) {
-               (void)ldns_rr2buffer_wire(buffer, ldns_rr_list_rr(rr_list, i), LDNS_SECTION_ANY);
+               (void)ldns_rr2buffer_wire(buffer, ldns_rr_list_rr(rr_list, i), 
+                                         LDNS_SECTION_ANY);
        }
        return ldns_buffer_status(buffer);
 }
@@ -87,12 +84,9 @@ ldns_rr2buffer_wire(ldns_buffer *buffer, const ldns_rr *rr, int section)
                }
                
                if (rdl_pos != 0) {
-                       ldns_buffer_write_u16_at(buffer,
-                                                rdl_pos,
+                       ldns_buffer_write_u16_at(buffer, rdl_pos,
                                                 ldns_buffer_position(buffer)
-                                                  - rdl_pos
-                                                  - 2
-                                                  );
+                                                  - rdl_pos - 2);
                }
        }
        return ldns_buffer_status(buffer);
@@ -146,15 +140,13 @@ ldns_hdr2buffer_wire(ldns_buffer *buffer, const ldns_pkt *packet)
                flags = ldns_pkt_qr(packet) << 7
                        | ldns_pkt_get_opcode(packet) << 3
                        | ldns_pkt_aa(packet) << 2
-                       | ldns_pkt_tc(packet) << 1
-                       | ldns_pkt_rd(packet);
+                       | ldns_pkt_tc(packet) << 1 | ldns_pkt_rd(packet);
                ldns_buffer_write_u8(buffer, flags);
                
                flags = ldns_pkt_ra(packet) << 7
                        /*| ldns_pkt_z(packet) << 6*/
                        | ldns_pkt_ad(packet) << 5
-                       | ldns_pkt_cd(packet) << 4
-                       | ldns_pkt_rcode(packet);
+                       | ldns_pkt_cd(packet) << 4 | ldns_pkt_rcode(packet);
                ldns_buffer_write_u8(buffer, flags);
                
                ldns_buffer_write_u16(buffer, ldns_pkt_qdcount(packet));
@@ -190,39 +182,36 @@ ldns_pkt2buffer_wire(ldns_buffer *buffer, const ldns_pkt *packet)
        if (rr_list) {
                for (i = 0; i < ldns_rr_list_rr_count(rr_list); i++) {
                        (void) ldns_rr2buffer_wire(buffer, 
-                                    ldns_rr_list_rr(rr_list, i), 
-                                    LDNS_SECTION_QUESTION);
+                                    ldns_rr_list_rr(rr_list, i), LDNS_SECTION_QUESTION);
                }
        }
        rr_list = ldns_pkt_answer(packet);
        if (rr_list) {
                for (i = 0; i < ldns_rr_list_rr_count(rr_list); i++) {
                        (void) ldns_rr2buffer_wire(buffer, 
-                                    ldns_rr_list_rr(rr_list, i), 
-                                    LDNS_SECTION_ANSWER);
+                                    ldns_rr_list_rr(rr_list, i), LDNS_SECTION_ANSWER);
                }
        }
        rr_list = ldns_pkt_authority(packet);
        if (rr_list) {
                for (i = 0; i < ldns_rr_list_rr_count(rr_list); i++) {
                        (void) ldns_rr2buffer_wire(buffer, 
-                                    ldns_rr_list_rr(rr_list, i), 
-                                    LDNS_SECTION_AUTHORITY);
+                                    ldns_rr_list_rr(rr_list, i), LDNS_SECTION_AUTHORITY);
                }
        }
        rr_list = ldns_pkt_additional(packet);
        if (rr_list) {
                for (i = 0; i < ldns_rr_list_rr_count(rr_list); i++) {
                        (void) ldns_rr2buffer_wire(buffer, 
-                                    ldns_rr_list_rr(rr_list, i), 
-                                    LDNS_SECTION_ADDITIONAL);
+                                    ldns_rr_list_rr(rr_list, i), LDNS_SECTION_ADDITIONAL);
                }
        }
        
        /* add EDNS to additional if it is needed */
        if (ldns_pkt_edns(packet)) {
                edns_rr = ldns_rr_new();
-               ldns_rr_set_owner(edns_rr, ldns_rdf_new_frm_str(LDNS_RDF_TYPE_DNAME, "."));
+               ldns_rr_set_owner(edns_rr,
+                               ldns_rdf_new_frm_str(LDNS_RDF_TYPE_DNAME, "."));
                ldns_rr_set_type(edns_rr, LDNS_RR_TYPE_OPT);
                ldns_rr_set_class(edns_rr, ldns_pkt_edns_udp_size(packet));
                edata[0] = ldns_pkt_edns_extended_rcode(packet);
@@ -236,8 +225,7 @@ ldns_pkt2buffer_wire(ldns_buffer *buffer, const ldns_pkt *packet)
        /* add TSIG to additional if it is there */
        if (ldns_pkt_tsig(packet)) {
                (void) ldns_rr2buffer_wire(buffer,
-                                          ldns_pkt_tsig(packet),
-                                          LDNS_SECTION_ADDITIONAL);
+                                          ldns_pkt_tsig(packet), LDNS_SECTION_ADDITIONAL);
        }
        
        return LDNS_STATUS_OK;

diff --git a/parse.c b/parse.c
index 14ed05627f7377839922833338c3eafaa73215cb..d682752c9611063251d45a32ad9a87d0c53b8e52 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -140,7 +140,8 @@ ssize_t
 ldns_fget_keyword_data(FILE *f, const char *keyword, const char *k_del, char *data,
                const char *d_del, size_t data_limit)
 {
-       return ldns_fget_keyword_data_l(f, keyword, k_del, data, d_del, data_limit, NULL);
+       return ldns_fget_keyword_data_l(f, keyword, k_del, data, d_del, 
+                      data_limit, NULL);
 }
 
 ssize_t
@@ -277,7 +278,8 @@ void
 ldns_bskipc(ldns_buffer *buffer, char c)
 {
         while (c == (char) ldns_buffer_read_u8_at(buffer, ldns_buffer_position(buffer))) {
-                if (ldns_buffer_available_at(buffer, buffer->_position + sizeof(char), sizeof(char))) {
+                if (ldns_buffer_available_at(buffer, 
+                                       buffer->_position + sizeof(char), sizeof(char))) {
                         buffer->_position += sizeof(char);
                 } else {
                         return;
@@ -293,8 +295,7 @@ ldns_bskipcs(ldns_buffer *buffer, const char *s)
         const char *d;
 
         while(ldns_buffer_available_at(buffer, buffer->_position, sizeof(char))) {
-                c = (char) ldns_buffer_read_u8_at(buffer,
-                                           buffer->_position);
+                c = (char) ldns_buffer_read_u8_at(buffer, buffer->_position);
                 found = false;
                 for (d = s; *d; d++) {
                         if (*d == c) {

diff --git a/test/codingstyle.tpkg b/test/codingstyle.tpkg
index 183316c2ce92809373a9485f155e2648487080a4..24974c877ce8684ac143ea4ad2e5a23a8a483145 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:12 CET by <miekg@elektron>.
+# Made on 2006-03-15 10:30 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
-#   1119 -rw------- codingstyle.test
+#   1210 -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 _sh07636; then
+if mkdir _sh09941; then
   $echo 'x -' 'creating lock directory'
 else
   $echo 'failed to create lock directory'
@@ -151,20 +151,22 @@ st=0
 for i in ../../*.c; do
 X
 X        case $i in
-X        "../../util.c" | "../../host2str.c")
+X        "../../util.c" | "../../host2str.c" | "../../resolver.c")
 X                continue;;
-X        "../../error.c" | "../../rr.c")
+X        "../../error.c" | "../../rr.c" | "../../str2host.c")
 X                continue;;
-X        "../../keys.c" | "../../linktest.c")
+X        "../../keys.c" | "../../linktest.c" | "../../dnssec.c")
+X                continue;;
+X        "../../packet.c" | "../../parse.c")
 X                continue;;
 X        esac
 X
 X        case $OSTYPE in
 X        linux-gnu*)
-X                diff -w -u $i <(cat $i | indent -l$L $OPT) 
+X                diff -w -u $i <(cat $i | indent -l$L $OPT) | grep ^---
 X                ;;
 X        freebsd*) 
-X                diff -w -u $i <(cat $i | gindent -l$L $OPT)
+X                diff -w -u $i <(cat $i | gindent -l$L $OPT)| grep ^---
 X                ;;
 X        esac
 X              
@@ -172,26 +174,25 @@ X        if [[ $? -eq 1 ]]; then
 X                st=1
 X        fi
 done
-if [[ $st -eq 1 ]]; then
-X        echo "There are coding style improvements possible..."
+if [[ $st -eq 0 ]]; then
 X        exit 1
 fi
 Xexit 0
 SHAR_EOF
-  (set 20 06 03 15 10 12 38 'codingstyle.test'; eval "$shar_touch") &&
+  (set 20 06 03 15 10 30 39 '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'
-a7199cb299797001f5e5d0121b2d97a7  codingstyle.test
+21bdc4c1a4581824207c4a170a40369d  codingstyle.test
 SHAR_EOF
   else
     shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < 'codingstyle.test'`"
-    test 1119 -eq "$shar_count" ||
-    $echo 'codingstyle.test:' 'original size' '1119,' 'current size' "$shar_count!"
+    test 1210 -eq "$shar_count" ||
+    $echo 'codingstyle.test:' 'original size' '1210,' 'current size' "$shar_count!"
   fi
 fi
-rm -fr _sh07636
+rm -fr _sh09941
 exit 0