[Asterisk-code-review] Replace direct checks of option debug with DEBUG ATLEAST macro. (asterisk[15])

Corey Farrell asteriskteam at digium.com
Wed Mar 7 00:58:26 CST 2018 

Corey Farrell has uploaded this change for review. ( https://gerrit.asterisk.org/8450


Change subject: Replace direct checks of option_debug with DEBUG_ATLEAST macro.
......................................................................

Replace direct checks of option_debug with DEBUG_ATLEAST macro.

Checking option_debug directly is incorrect as it ignores file/module
specific debug settings.  This system-wide change replaces nearly all
direct checks for option_debug with the DEBUG_ATLEAST module.

Change-Id: Ic342d4799a945dbc40ac085ac142681094a4ebf0
---
M addons/chan_ooh323.c
M apps/app_directory.c
M apps/app_minivm.c
M apps/app_voicemail.c
M cdr/cdr_pgsql.c
M cel/cel_pgsql.c
M channels/chan_dahdi.c
M channels/chan_sip.c
M main/callerid.c
M main/config.c
M main/netsock2.c
M main/pbx.c
M main/sched.c
M res/res_config_ldap.c
M res/res_config_pgsql.c
M res/res_rtp_asterisk.c
16 files changed, 25 insertions(+), 26 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/50/8450/1

diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c
index 8c4ff2c..278c587 100644
--- a/addons/chan_ooh323.c
+++ b/addons/chan_ooh323.c
@@ -1174,8 +1174,7 @@
 				p->alertsent = 1;
 			}
 			ast_setstate(ast, AST_STATE_UP);
-      			if (option_debug)
-				ast_debug(1, "ooh323_answer(%s)\n", ast_channel_name(ast));
+			ast_debug(1, "ooh323_answer(%s)\n", ast_channel_name(ast));
 			ast_channel_unlock(ast);
 			ooAnswerCall(p->callToken);
 		}
diff --git a/apps/app_directory.c b/apps/app_directory.c
index 48533f5..c268969 100644
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -815,7 +815,7 @@
 	/* Sort items */
 	sort_items(sorted, count);
 
-	if (option_debug) {
+	if (DEBUG_ATLEAST(2)) {
 		ast_debug(2, "Listing matching entries:\n");
 		for (ptr = sorted, i = 0; i < count; i++, ptr++) {
 			ast_debug(2, "%s: %s\n", ptr[0]->exten, ptr[0]->name);
diff --git a/apps/app_minivm.c b/apps/app_minivm.c
index e9fa211..c09fba1 100644
--- a/apps/app_minivm.c
+++ b/apps/app_minivm.c
@@ -1438,7 +1438,7 @@
 		ast_debug(1, "Using default subject for this email \n");
 	}
 
-	if (option_debug > 2)
+	if (DEBUG_ATLEAST(3))
 		fprintf(p, "X-Asterisk-debug: template %s user account %s@%s\n", template->name, vmu->username, vmu->domain);
 	fprintf(p, "MIME-Version: 1.0\n");
 
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index d22a839..a5b085e 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -3638,7 +3638,7 @@
 	char buf[1024] = "";
 
 	if (!(user = get_user_by_mailbox(mailbox, buf, sizeof(buf))) || !(vms = get_vm_state_by_imapuser(user, 0))) {
-		if (user && option_debug > 2)
+		if (user && DEBUG_ATLEAST(3))
 			ast_log(AST_LOG_WARNING, "User %s mailbox not found for update.\n", user);
 		return;
 	}
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index 33cc1b8..76c76f6 100644
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -642,7 +642,7 @@
 		return -1;
 	}
 
-	if (option_debug) {
+	if (DEBUG_ATLEAST(1)) {
 		if (ast_strlen_zero(pghostname)) {
 			ast_debug(1, "using default unix socket\n");
 		} else {
diff --git a/cel/cel_pgsql.c b/cel/cel_pgsql.c
index 5fe6678..6a2bac5 100644
--- a/cel/cel_pgsql.c
+++ b/cel/cel_pgsql.c
@@ -556,7 +556,7 @@
 		ast_log(LOG_WARNING,"PostgreSQL Ran out of memory copying schema info\n");
 		return AST_MODULE_LOAD_DECLINE;
 	}
-	if (option_debug) {
+	if (DEBUG_ATLEAST(3)) {
 		if (ast_strlen_zero(pghostname)) {
 			ast_debug(3, "cel_pgsql: using default unix socket\n");
 		} else {
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 4859d1a..c149763 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -15058,14 +15058,14 @@
 		ast_mutex_lock(&p->lock);
 		if (p->owner && !p->restartpending) {
 			if (ast_channel_trylock(p->owner)) {
-				if (option_debug > 2)
+				if (DEBUG_ATLEAST(3))
 					ast_verbose("Avoiding deadlock\n");
 				/* Avoid deadlock since you're not supposed to lock iflock or pvt before a channel */
 				ast_mutex_unlock(&p->lock);
 				ast_mutex_unlock(&iflock);
 				goto retry;
 			}
-			if (option_debug > 2)
+			if (DEBUG_ATLEAST(3))
 				ast_verbose("Softhanging up on %s\n", ast_channel_name(p->owner));
 			ast_softhangup_nolock(p->owner, AST_SOFTHANGUP_EXPLICIT);
 			p->restartpending = 1;
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 9cdf71c..040a221 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -22400,7 +22400,7 @@
 		return;
 	}
 
-	if (!option_debug && !sipdebug) {
+	if (!DEBUG_ATLEAST(1) && !sipdebug) {
 		if (!errmsg) {
 			ast_log(LOG_NOTICE, "You must have debugging enabled (SIP or Asterisk) in order to dump SIP history.\n");
 			errmsg = 1;
diff --git a/main/callerid.c b/main/callerid.c
index d6f8575..6c4e5cf 100644
--- a/main/callerid.c
+++ b/main/callerid.c
@@ -501,7 +501,7 @@
 						case 0x06: /* short dial number */
 						case 0x07: /* reserved */
 						default:   /* reserved */
-							if (option_debug > 1)
+							if (DEBUG_ATLEAST(2))
 								ast_log(LOG_NOTICE, "did info:#1=%X\n", (unsigned)cid->rawdata[x]);
 							break ;
 						}
diff --git a/main/config.c b/main/config.c
index 8107fce..2988ecd 100644
--- a/main/config.c
+++ b/main/config.c
@@ -2785,7 +2785,7 @@
 			}
 			cat = cat->next;
 		}
-		if (!option_debug) {
+		if (!DEBUG_ATLEAST(1)) {
 			ast_verb(2, "Saving '%s': saved\n", fn);
 		}
 	} else {
diff --git a/main/netsock2.c b/main/netsock2.c
index ef74ab9..fedbd94 100644
--- a/main/netsock2.c
+++ b/main/netsock2.c
@@ -443,7 +443,7 @@
 		&& addr->ss.ss_family == AF_INET6) {
 		return ntohs(((struct sockaddr_in6 *)&addr->ss)->sin6_port);
 	}
-	if (option_debug >= 1) {
+	if (DEBUG_ATLEAST(1)) {
 		ast_log(__LOG_DEBUG, file, line, func, "Not an IPv4 nor IPv6 address, cannot get port.\n");
 	}
 	return 0;
@@ -461,7 +461,7 @@
 	} else if (addr->len == sizeof(struct sockaddr_in6)
 		&& addr->ss.ss_family == AF_INET6) {
 		((struct sockaddr_in6 *)&addr->ss)->sin6_port = htons(port);
-	} else if (option_debug >= 1) {
+	} else if (DEBUG_ATLEAST(1)) {
 		ast_log(__LOG_DEBUG, file, line, func,
 			"Not an IPv4 nor IPv6 address, cannot set port.\n");
 	}
@@ -657,7 +657,7 @@
 		return 0;
 	}
 
-	if (addr->ss.ss_family != AF_INET && option_debug >= 1) {
+	if (addr->ss.ss_family != AF_INET && DEBUG_ATLEAST(1)) {
 		ast_log(__LOG_DEBUG, file, line, func, "Address family is not AF_INET\n");
 	}
 
@@ -670,7 +670,7 @@
 {
 	memcpy(&addr->ss, sin, sizeof(*sin));
 
-	if (addr->ss.ss_family != AF_INET && option_debug >= 1) {
+	if (addr->ss.ss_family != AF_INET && DEBUG_ATLEAST(1)) {
 		ast_log(__LOG_DEBUG, file, line, func, "Address family is not AF_INET\n");
 	}
 
diff --git a/main/pbx.c b/main/pbx.c
index 942c15c..f515339 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -7508,7 +7508,7 @@
 			ast_add_hint(tmp);
 		}
 	}
-	if (option_debug) {
+	if (DEBUG_ATLEAST(1)) {
 		if (tmp->matchcid == AST_EXT_MATCHCID_ON) {
 			ast_debug(1, "Added extension '%s' priority %d (CID match '%s') to %s (%p)\n",
 					  tmp->name, tmp->priority, tmp->cidmatch_display, con->name, con);
diff --git a/main/sched.c b/main/sched.c
index a4ca260..a11b013 100644
--- a/main/sched.c
+++ b/main/sched.c
@@ -32,7 +32,7 @@
 
 #ifdef DEBUG_SCHEDULER
 #define DEBUG(a) do { \
-	if (option_debug) \
+	if (DEBUG_ATLEAST(1)) \
 		DEBUG_M(a) \
 	} while (0)
 #else
@@ -548,7 +548,7 @@
 	}
 #ifdef DUMP_SCHEDULER
 	/* Dump contents of the context while we have the lock so nothing gets screwed up by accident. */
-	if (option_debug)
+	if (DEBUG_ATLEAST(1))
 		ast_sched_dump(con);
 #endif
 	if (con->sched_thread) {
@@ -649,7 +649,7 @@
 
 #ifdef DUMP_SCHEDULER
 	/* Dump contents of the context while we have the lock so nothing gets screwed up by accident. */
-	if (option_debug)
+	if (DEBUG_ATLEAST(1))
 		ast_sched_dump(con);
 #endif
 	if (con->sched_thread) {
diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c
index 10265c9..c767cba 100644
--- a/res/res_config_ldap.c
+++ b/res/res_config_ldap.c
@@ -548,7 +548,7 @@
 			} /*!< while (ldap_attribute_name) */
 			ber_free(ber, 0);
 			if (static_table_config == table_config) {
-				if (option_debug > 2) {
+				if (DEBUG_ATLEAST(3)) {
 					const struct ast_variable *tmpdebug = variable_named(var, "variable_name");
 					const struct ast_variable *tmpdebug2 = variable_named(var, "variable_value");
 					if (tmpdebug && tmpdebug2) {
@@ -1618,7 +1618,7 @@
 
 	/* Ready to update */
 	ast_debug(3, "Modifying %zu matched entries\n", entry_count);
-	if (option_debug > 2) {
+	if (DEBUG_ATLEAST(3)) {
 		size_t i;
 		for (i = 0; modifications[i]; i++) {
 			if (modifications[i]->mod_op != LDAP_MOD_DELETE) {
diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index 6ae6ebd..5b9f160 100644
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -1528,7 +1528,7 @@
 
 	ast_config_destroy(config);
 
-	if (option_debug) {
+	if (DEBUG_ATLEAST(1)) {
 		if (!ast_strlen_zero(dbhost)) {
 			ast_debug(1, "PostgreSQL RealTime Host: %s\n", dbhost);
 			ast_debug(1, "PostgreSQL RealTime Port: %i\n", dbport);
diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index b53b38a..7cbfdf0 100644
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -4565,7 +4565,7 @@
 	format = frame->subclass.format;
 	if (ast_format_cmp(rtp->lasttxformat, format) == AST_FORMAT_CMP_NOT_EQUAL) {
 		/* Oh dear, if the format changed we will have to set up a new smoother */
-		if (option_debug > 0) {
+		if (DEBUG_ATLEAST(1)) {
 			ast_debug(1, "Ooh, format changed from %s to %s\n",
 				ast_format_get_name(rtp->lasttxformat),
 				ast_format_get_name(frame->subclass.format));
@@ -5744,7 +5744,7 @@
 				ast_sockaddr_stringify(&remote_address),
 				strerror(errno));
 		} else if (((ast_test_flag(bridged, FLAG_NAT_ACTIVE) == FLAG_NAT_INACTIVE) || rtpdebug) && !ast_test_flag(bridged, FLAG_NAT_INACTIVE_NOWARN)) {
-			if (option_debug || rtpdebug) {
+			if (DEBUG_ATLEAST(1) || rtpdebug) {
 				ast_log(LOG_WARNING,
 					"RTP NAT: Can't write RTP to private "
 					"address %s, waiting for other end to "
@@ -6117,7 +6117,7 @@
 	if (ext) {
 		hdrlen += (ntohl(rtpheader[hdrlen/4]) & 0xffff) << 2;
 		hdrlen += 4;
-		if (option_debug) {
+		if (DEBUG_ATLEAST(1)) {
 			unsigned int profile;
 			profile = (ntohl(rtpheader[3]) & 0xffff0000) >> 16;
 			if (profile == 0x505a)

-- 
To view, visit https://gerrit.asterisk.org/8450
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 15
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic342d4799a945dbc40ac085ac142681094a4ebf0
Gerrit-Change-Number: 8450
Gerrit-PatchSet: 1
Gerrit-Owner: Corey Farrell <git at cfware.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180307/09819c3f/attachment-0001.html>

More information about the asterisk-code-review mailing list