From: Matthew Fredrickson <creslin@digium.com>
Date: Fri, 10 Nov 2006 22:06:11 +0000 (+0000)
Subject: Make sure we don't use 32bits for a value that only requires 1 bit.  Also, fix a... 
X-Git-Tag: 1.6.0-beta1~3^2~4034
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69d3416c12f42ae21bb856ad14f6ea9753a4fb0d;p=thirdparty%2Fasterisk.git

Make sure we don't use 32bits for a value that only requires 1 bit.  Also, fix a compiler warning for one of the SS7 functions.


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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 94809af790..9c58f5a143 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -614,8 +614,8 @@ static struct zt_pvt {
 	unsigned int firstradio:1;
 	unsigned int hanguponpolarityswitch:1;
 	unsigned int hardwaredtmf:1;
-	unsigned int hidecallerid;
-	unsigned int hidecalleridname;      /*!< Hide just the name not the number for legacy PBX use */
+	unsigned int hidecallerid:1;
+	unsigned int hidecalleridname:1;      /*!< Hide just the name not the number for legacy PBX use */
 	unsigned int ignoredtmf:1;
 	unsigned int immediate:1;			/*!< Answer before getting digits? */
 	unsigned int inalarm:1;
@@ -8349,7 +8349,7 @@ static void ss7_reset_linkset(struct zt_ss7 *linkset)
 	int i, startcic = -1, endcic;
 
 	if (linkset->numchans <= 0)
-		return 0;
+		return;
 
 	startcic = linkset->pvts[0]->cic;