summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorMatthew Fredrickson <creslin@digium.com>2006-11-10 22:06:11 +0000
committerMatthew Fredrickson <creslin@digium.com>2006-11-10 22:06:11 +0000
commit69d3416c12f42ae21bb856ad14f6ea9753a4fb0d (patch)
treeafefcb90dd374e2530cc49f8b9535b54a6616db6 /channels
parent0c18d918176606ee293085ba679d6e056c0b93b4 (diff)
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
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_zap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 94809af79..9c58f5a14 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;