more small stuff

diff --git a/ldns/zone.h b/ldns/zone.h
index 73d1ab6cf5e7033c54bc509eb468ec2a6476a2fd..ca3fe1b510fdf06ca528aa153f251b2b30a091f1 100644 (file)
--- a/ldns/zone.h
+++ b/ldns/zone.h
@@ -112,7 +112,8 @@ bool ldns_zone_push_rr(ldns_zone *z, ldns_rr *rr);
  * to the zone's data.
  *
  * Due to the current zone implementation (as a list of rr's), this
- * function is extremely slow.
+ * function is extremely slow. Another (probably better) way to do this
+ * is to use an ldns_dnssec_zone structure and the mark_glue function 
  *
  * \param[in] z the zone to look for glue
  * \return the rr_list with the glue

diff --git a/net.c b/net.c
index b71d11d29cc82ddfadc3fcba795872dc6a2d1adb..544056c0b2c77dbb475b92948f26bba29c133b3c 100644 (file)
--- a/net.c
+++ b/net.c
@@ -49,14 +49,6 @@ ldns_send(ldns_pkt **result_packet, ldns_resolver *r, const ldns_pkt *query_pkt)
                result = LDNS_STATUS_ERR;
        } else {
                result = ldns_send_buffer(result_packet, r, qb, tsig_mac);
-/*
-printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
-ldns_pkt_print(stdout, query_pkt);
-printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n\n");
-printf("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n");
-ldns_pkt_print(stdout, *result_packet);
-printf("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n\n");
-*/
        }
 
        ldns_buffer_free(qb);
@@ -215,7 +207,7 @@ ldns_send_buffer(ldns_pkt **result, ldns_resolver *r, ldns_buffer *qb, ldns_rdf
                }
        }
 #else
-       tsig_mac = tsig_mac;
+       (void)tsig_mac;
 #endif /* HAVE_SSL */
        
        LDNS_FREE(reply_bytes);

diff --git a/rdata.c b/rdata.c
index 6217d3017bd0f972a4eb198b9806b196c6754201..6de6007d1fc814120d7fa7ef99a50e7548bed467 100644 (file)
--- a/rdata.c
+++ b/rdata.c
@@ -306,7 +306,6 @@ ldns_rdf_new_frm_str(ldns_rdf_type type, const char *str)
        case LDNS_RDF_TYPE_NONE:
        default:
                /* default default ??? */
-               printf("unknown\n");
                status = LDNS_STATUS_ERR;
                break;
        }

diff --git a/update.c b/update.c
index 388ef3651b5f4e7c1e8e5a1ff3bfc285c463332e..2d33370ae74db6bb4529563db3ba80dacc93d7ed 100644 (file)
--- a/update.c
+++ b/update.c
@@ -77,8 +77,8 @@ ldns_update_pkt_tsig_add(ldns_pkt *p, ldns_resolver *r)
                    ldns_resolver_tsig_algorithm(r), NULL);
 #else
        /* do nothing */
-       p = p;
-       r = r;
+       (void)p;
+       (void)r;
 #endif /* HAVE_SSL */
        /* No TSIG to do. */
        return LDNS_STATUS_OK;

diff --git a/zone.c b/zone.c
index 37e83be9325702edb56ff45702f290f7c1e6fac5..7110c3a00b22ecc0ed198ca8679cf164af6fe8c7 100644 (file)
--- a/zone.c
+++ b/zone.c
@@ -135,22 +135,12 @@ ldns_zone_strip_glue_rrs(const ldns_rdf *zone_name, const ldns_rr_list *rrs, ldn
        return new_list;
 }
 
-/* this will be an EXPENSIVE op with our zone structure */
+/*
+ * Get the list of glue records in a zone
+ */
 ldns_rr_list *
 ldns_zone_glue_rr_list(const ldns_zone *z)
 {
-#if 0
-       ldns_rr_list *rrs = ldns_zone_rrs(z);
-       ldns_rr_list *glue_rrs = ldns_rr_list_new();
-       ldns_rr_list *stripped_rrs = ldns_zone_strip_glue_rrs(ldns_rr_owner(ldns_zone_soa(z)), rrs, glue_rrs);
-       printf("stripped:\n");
-       ldns_rr_list_print(stdout, stripped_rrs);
-       printf("glue:\n");
-       ldns_rr_list_print(stdout, glue_rrs);
-       ldns_rr_list_free(stripped_rrs);
-       return glue_rrs;
-#endif
-
        /* when do we find glue? It means we find an IP address
         * (AAAA/A) for a nameserver listed in the zone
         *
@@ -225,7 +215,6 @@ ldns_zone_glue_rr_list(const ldns_zone *z)
        } else {
                return glue;
        }
-
 }
 
 ldns_zone *