automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37432 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-07-12 14:02:32 +00:00
parent fac0ba002f
commit 94755549d7
9 changed files with 29 additions and 114 deletions

10
enum.c
View File

@@ -212,12 +212,6 @@ static int parse_naptr(unsigned char *dst, int dstsize, char *tech, int techsize
subst = delim2 + 1;
regexp[regexp_len-1] = 0;
#if 0
printf("Pattern: %s\n", pattern);
printf("Subst: %s\n", subst);
printf("Input: %s\n", naptrinput);
#endif
/*
* now do the regex wizardry.
*/
@@ -312,9 +306,6 @@ struct enum_context {
static int txt_callback(void *context, char *answer, int len, char *fullanswer)
{
struct enum_context *c = (struct enum_context *)context;
#if 0
printf("ENUMTXT Called\n");
#endif
if (answer == NULL) {
c->txt = NULL;
@@ -364,7 +355,6 @@ static int enum_callback(void *context, char *answer, int len, char *fullanswer)
if (p) {
c->naptr_rrs = (struct enum_naptr_rr*)p;
memcpy(&c->naptr_rrs[c->naptr_rrs_count].naptr, answer, sizeof(struct naptr));
/* printf("order=%d, pref=%d\n", ntohs(c->naptr_rrs[c->naptr_rrs_count].naptr.order), ntohs(c->naptr_rrs[c->naptr_rrs_count].naptr.pref)); */
c->naptr_rrs[c->naptr_rrs_count].result = strdup(c->dst);
c->naptr_rrs[c->naptr_rrs_count].tech = strdup(c->tech);
c->naptr_rrs[c->naptr_rrs_count].sort_pos = c->naptr_rrs_count;