get rid of some more printf's (although most of these were ifdef-ed out)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@37417 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/enum.c b/enum.c
index 9daef1ef71af0fb25c805e1b5c3df05030882ed0..6c53632d9a0a3deeabd56bc9caccc0e29e973b23 100644 (file)
--- a/enum.c
+++ b/enum.c
@@ -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;

diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 6e482b5403be133479948b5077b9e45ae2b771e3..6ece9d7e06059cdb9f9f17926012f66f0769448b 100644 (file)
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -1745,7 +1745,9 @@ static int pbx_load_module(void)
                                                                }
                                                        }
                                                        free(tc);
-                                               } else fprintf(stderr,"Error strdup returned NULL in %s\n",__PRETTY_FUNCTION__);
+                                               } else {
+                                                       ast_log(LOG_ERROR, "Memory allocation failure\n");
+                                               }
                                        } else if(!strcasecmp(v->name, "include")) {
                                                memset(realvalue, 0, sizeof(realvalue));
                                                pbx_substitute_variables_helper(NULL, v->value, realvalue, sizeof(realvalue) - 1);