Do a massive conversion for using the ast_verb() macro

(closes issue #10277, patches by mvanbaak)

Basically, this changes ...

if (option_verbose > 2)
   ast_verbose(VERBOSE_PREFIX_3, "Something\n");

to ...

ast_verb(3, "Something\n");


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@77299 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 7 insertions, 14 deletions

diff --git a/apps/app_db.c b/apps/app_db.c
index b6cead568..f7d2ceaf5 100644
--- a/apps/app_db.c
+++ b/apps/app_db.c
@@ -85,17 +85,13 @@ static int deltree_exec(struct ast_channel *chan, void *data)
 		keytree = 0;
 	}
 
-	if (option_verbose > 2)	{
 		if (keytree)
-			ast_verbose(VERBOSE_PREFIX_3 "DBdeltree: family=%s, keytree=%s\n", family, keytree);
+		ast_verb(3, "DBdeltree: family=%s, keytree=%s\n", family, keytree);
 		else
-			ast_verbose(VERBOSE_PREFIX_3 "DBdeltree: family=%s\n", family);
-	}
+		ast_verb(3, "DBdeltree: family=%s\n", family);
 
-	if (ast_db_deltree(family, keytree)) {
-		if (option_verbose > 2)
-			ast_verbose(VERBOSE_PREFIX_3 "DBdeltree: Error deleting key from database.\n");
-	}
+	if (ast_db_deltree(family, keytree))
+		ast_verb(3, "DBdeltree: Error deleting key from database.\n");
 
 	return 0;
 }
@@ -119,12 +115,9 @@ static int del_exec(struct ast_channel *chan, void *data)
 			ast_debug(1, "Ignoring; Syntax error in argument\n");
 			return 0;
 		}
-		if (option_verbose > 2)
-			ast_verbose(VERBOSE_PREFIX_3 "DBdel: family=%s, key=%s\n", family, key);
-		if (ast_db_del(family, key)) {
-			if (option_verbose > 2)
-				ast_verbose(VERBOSE_PREFIX_3 "DBdel: Error deleting key from database.\n");
-		}
+		ast_verb(3, "DBdel: family=%s, key=%s\n", family, key);
+		if (ast_db_del(family, key))
+			ast_verb(3, "DBdel: Error deleting key from database.\n");
 	} else {
 		ast_debug(1, "Ignoring, no parameters\n");
 	}