[Pkg-voip-commits] [dahdi-tools] 259/285: xpp: xtalk -- no private status range

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch master
in repository dahdi-tools.

commit bd49fc9d9577a0a2a27e9f3e25a463b2a222e7e3
Author: Oron Peled <oron.peled at xorcom.com>
Date:   Mon Dec 15 11:14:21 2014 -0500

    xpp: xtalk -- no private status range
    
    Signed-off-by: Oron Peled <oron.peled at xorcom.com>
    Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
---
 xpp/xtalk/xtalk_base.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/xpp/xtalk/xtalk_base.c b/xpp/xtalk/xtalk_base.c
index ee9e462..bbf5640 100644
--- a/xpp/xtalk/xtalk_base.c
+++ b/xpp/xtalk/xtalk_base.c
@@ -117,25 +117,17 @@ int xtalk_set_protocol(struct xtalk_base *xtalk_base,
 
 		stat_msg = (xproto) ? xproto->ack_statuses[i] : NULL;
 		if (stat_msg) {
-			if (!IS_PRIVATE_OP(i)) {
-				ERR("Bad status=0x%X "
-					"(should be in the range [0x%X-0x%X]\n",
-					i, PRIVATE_OP_FIRST, PRIVATE_OP_LAST);
-				return -EINVAL;
-			}
 			xtalk_base->xproto.ack_statuses[i] = stat_msg;
 			DBG("private: status=0x%X (%s)\n", i, stat_msg);
 		} else {
-			if (!IS_PRIVATE_OP(i)) {
-				const char	*stat_msg;
-
-				xtalk_base->xproto.ack_statuses[i] =
-					xproto_base->ack_statuses[i];
-				stat_msg = xtalk_base->xproto.ack_statuses[i];
-				if (stat_msg)
-					DBG("global: status=0x%X (%s)\n",
-						i, stat_msg);
-			}
+			const char	*global_msg;
+
+			xtalk_base->xproto.ack_statuses[i] =
+				xproto_base->ack_statuses[i];
+			global_msg = xtalk_base->xproto.ack_statuses[i];
+			if (global_msg)
+				DBG("global: status=0x%X (%s)\n",
+						i, global_msg);
 		}
 	}
 	xtalk_base->xproto.name = protoname;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/dahdi-tools.git