[asterisk-commits] branch 1.2 r37417 - in /branches/1.2: enum.c pbx/pbx_config.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Wed Jul 12 08:18:21 2006
New Revision: 37417

URL: http://svn.digium.com/view/asterisk?rev=37417&view=rev
Log:
get rid of some more printf's (although most of these were ifdef-ed out)

Modified:
    branches/1.2/enum.c
    branches/1.2/pbx/pbx_config.c

Modified: branches/1.2/enum.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/enum.c?rev=37417&r1=37416&r2=37417&view=diff
==============================================================================
--- branches/1.2/enum.c (original)
+++ branches/1.2/enum.c Wed Jul 12 08:18:21 2006
@@ -211,12 +211,6 @@
 	*delim2 = 0;
 	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 @@
 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 @@
                        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;

Modified: branches/1.2/pbx/pbx_config.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/pbx/pbx_config.c?rev=37417&r1=37416&r2=37417&view=diff
==============================================================================
--- branches/1.2/pbx/pbx_config.c (original)
+++ branches/1.2/pbx/pbx_config.c Wed Jul 12 08:18:21 2006
@@ -1745,7 +1745,9 @@
 								}
 							}
 							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);