From: Matthew Jordan <mjordan@digium.com>
Date: Thu, 14 Feb 2013 03:48:39 +0000 (+0000)
Subject: Don't throw a spurious error when using DBdeltree
X-Git-Tag: 11.4.0-rc1~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eda002a828ccfcab4c9fa7d1f77ca73e7d73bf29;p=thirdparty%2Fasterisk.git

Don't throw a spurious error when using DBdeltree

The function call ast_db_deltree returns the number of row deleted, or a
negative number if it failed. DBdeltree was treating any non-zero return
as an error, causing a spurious verbose error message to be displayed.

This patch handles the return code of ast_db_deltree correctly.

(closes issue ASTERISK-21070)
Reported by: ianc
patches:
  dbdeltree.diff uploaded by ianc (License #5955)
........

Merged revisions 381364 from http://svn.asterisk.org/svn/asterisk/branches/1.8


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

diff --git a/apps/app_db.c b/apps/app_db.c
index 1fa24088e0..ef8d0b3a43 100644
--- a/apps/app_db.c
+++ b/apps/app_db.c
@@ -106,13 +106,15 @@ static int deltree_exec(struct ast_channel *chan, const char *data)
 		keytree = 0;
 	}
 
-	if (keytree)
+	if (keytree) {
 		ast_verb(3, "DBdeltree: family=%s, keytree=%s\n", family, keytree);
-	else
+	} else {
 		ast_verb(3, "DBdeltree: family=%s\n", family);
+	}
 
-	if (ast_db_deltree(family, keytree))
+	if (ast_db_deltree(family, keytree) < 0) {
 		ast_verb(3, "DBdeltree: Error deleting key from database.\n");
+	}
 
 	return 0;
 }