summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2012-02-09 03:09:39 +0000
committerRichard Mudgett <rmudgett@digium.com>2012-02-09 03:09:39 +0000
commit16fbc7e9028a3cbc3e2756178920a175637e589d (patch)
tree7791f83899ea4fd5820a66b75de3e90203af8555 /channels
parent5816c6065435258e32e791abccc90c254862da8b (diff)
Fix some compile problems from the 'cppcheck' patch.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@354498 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_dahdi.c10
-rw-r--r--channels/chan_misdn.c2
2 files changed, 9 insertions, 3 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index ee6e0024e..e6457b1e0 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -18898,11 +18898,17 @@ static int dahdi_sendtext(struct ast_channel *c, const char *text)
struct pollfd fds[1];
int size,res,fd,len,x;
int bytes=0;
- /* Initial carrier (imaginary) */
+ int idx;
+
+ /*
+ * Initial carrier (imaginary)
+ *
+ * Note: The following float variables are used by the
+ * PUT_CLID_MARKMS and PUT_CLID() macros.
+ */
float cr = 1.0;
float ci = 0.0;
float scont = 0.0;
- int idx;
if (!text[0]) {
return(0); /* if nothing to send, don't */
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 2bfbaddfc..6017ee836 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -7504,7 +7504,7 @@ static int misdn_write(struct ast_channel *ast, struct ast_frame *frame)
} else {
/* transmit without jitterbuffer */
- i = misdn_lib_tx2misdn_frm(ch->bc, frame->data.ptr, frame->samples);
+ misdn_lib_tx2misdn_frm(ch->bc, frame->data.ptr, frame->samples);
}
return 0;