lint faster, lint fix and define.

git-svn-id: file:///svn/unbound/trunk@260 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2007-04-26 07:55:51 +00:00
parent f4ee65daa5
commit 182b6b7b46
4 changed files with 15 additions and 9 deletions

View file

@ -126,12 +126,13 @@ realclean: clean
rm -f util/configlexer.c util/configparser.c util/configparser.h rm -f util/configlexer.c util/configparser.c util/configparser.h
rm -f Makefile rm -f Makefile
lint: $(BUILD)%.lint: $(srcdir)/%.c
$Qfor i in $(filter-out util/configparser.c,$(filter-out util/configlexer.c,$(sort $(ALL_SRC)))); do \ $(INFO) Lint $<
echo lint $$i; \ @if test ! -d $(dir $@); then $(INSTALL) -d $(patsubst %/,%,$(dir $@)); fi
$(LINT) $(LINTFLAGS) -I. -I$(srcdir) -I$(ldnsdir)/include $(srcdir)/$$i ; \ $Q$(LINT) $(LINTFLAGS) -I. -I$(srcdir) -I$(ldnsdir)/include $<
if [ $$? -ne 0 ] ; then exit 1 ; fi ; \ $Qtouch $@
done
lint: $(addprefix $(BUILD),$(filter-out util/configparser.lint,$(filter-out util/configlexer.lint,$(sort $(ALL_SRC:.c=.lint)))))
tags: $(srcdir)/*.[ch] $(srcdir)/*/*.[ch] tags: $(srcdir)/*.[ch] $(srcdir)/*/*.[ch]
ctags -f $(srcdir)/tags $(srcdir)/*.[ch] $(srcdir)/*/*.[ch] ctags -f $(srcdir)/tags $(srcdir)/*.[ch] $(srcdir)/*/*.[ch]

View file

@ -1,5 +1,8 @@
26 April 2007: Wouter 26 April 2007: Wouter
- floating point exception fix in lock-verify. - floating point exception fix in lock-verify.
- lint uses make dependency
- fixup lint in dname owner domain name compression code.
- define for offset range that can be compressed to.
25 April 2007: Wouter 25 April 2007: Wouter
- prettier code; parse_rrset->type kept in host byte order. - prettier code; parse_rrset->type kept in host byte order.

View file

@ -183,6 +183,8 @@ struct rr_parse {
/** error codes, extended with EDNS, so > 15. */ /** error codes, extended with EDNS, so > 15. */
#define EDNS_RCODE_BADVERS 16 /** bad EDNS version */ #define EDNS_RCODE_BADVERS 16 /** bad EDNS version */
/** largest valid compression offset */
#define PTR_MAX_OFFSET 0x3fff
/** /**
* EDNS data storage * EDNS data storage

View file

@ -649,7 +649,7 @@ compress_tree_store(struct compress_tree_node** tree, uint8_t* dname,
if(closest) uplabs = labs - closest->labs; if(closest) uplabs = labs - closest->labs;
log_assert(uplabs >= 0); log_assert(uplabs >= 0);
while(uplabs--) { while(uplabs--) {
if(offset > 0x3fff) { /* largest valid compr. offset */ if(offset > PTR_MAX_OFFSET) {
if(lastparentptr) if(lastparentptr)
*lastparentptr = closest; *lastparentptr = closest;
return 1; /* compression pointer no longer useful */ return 1; /* compression pointer no longer useful */
@ -713,7 +713,7 @@ bakedname(int dosig, struct compress_tree_node** tree, size_t* offset,
struct compress_tree_node* p; struct compress_tree_node* p;
int labs = dname_count_labels(rk->dname); int labs = dname_count_labels(rk->dname);
p = compress_tree_lookup(*tree, rk->dname, labs); p = compress_tree_lookup(*tree, rk->dname, labs);
if(p) { if(p && p->offset <= PTR_MAX_OFFSET) {
/* compress it */ /* compress it */
int labcopy = labs - p->labs; int labcopy = labs - p->labs;
size_t len = 0; size_t len = 0;
@ -735,7 +735,7 @@ bakedname(int dosig, struct compress_tree_node** tree, size_t* offset,
from += lablen; from += lablen;
} }
/* insert compression ptr */ /* insert compression ptr */
ptr = 0xc000 | p->offset; ptr = (uint16_t)(0xc000 | p->offset);
ptr = htons(ptr); ptr = htons(ptr);
memmove(dat, &ptr, sizeof(ptr)); memmove(dat, &ptr, sizeof(ptr));
len += sizeof(ptr); len += sizeof(ptr);