[svn-commits] murf: trunk r77946 - in /trunk: ./ main/fskmodem.c
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu Aug 2 13:32:35 CDT 2007
Author: murf
Date: Thu Aug 2 13:32:34 2007
New Revision: 77946
URL: http://svn.digium.com/view/asterisk?view=rev&rev=77946
Log:
Merged revisions 77945 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r77945 | murf | 2007-08-02 12:21:40 -0600 (Thu, 02 Aug 2007) | 9 lines
Merged revisions 77942 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r77942 | murf | 2007-08-02 11:56:37 -0600 (Thu, 02 Aug 2007) | 1 line
This patch hopefully solves 10141; The user is running with it, and it doesn't appear to harm asterisk's operation, and may prevent a crash. I'll store it in 1.2, as we have shut down support on 1.2, but since I developed the patch before support finished, and it might affect 1.4 and trunk, I'm going ahead with it.
........
................
Modified:
trunk/ (props changed)
trunk/main/fskmodem.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Modified: trunk/main/fskmodem.c
URL: http://svn.digium.com/view/asterisk/trunk/main/fskmodem.c?view=diff&rev=77946&r1=77945&r2=77946
==============================================================================
--- trunk/main/fskmodem.c (original)
+++ trunk/main/fskmodem.c Thu Aug 2 13:32:34 2007
@@ -225,7 +225,9 @@
int i,j,n1,r;
int samples = 0;
int olen;
-
+ int beginlen=*len;
+ int beginlenx;
+
switch (fskd->state) {
/* Pick up where we left off */
case STATE_SEARCH_STARTBIT2:
@@ -253,12 +255,13 @@
beginning of a start bit in the TDD sceanario. It just looks for sufficient
level to maybe, perhaps, guess, maybe that its maybe the beginning of
a start bit, perhaps. This whole thing stinks! */
+ beginlenx=beginlen; /* just to avoid unused war warnings */
if (demodulator(fskd, &fskd->x1, GET_SAMPLE))
return -1;
samples++;
for (;;) {
search_startbit2:
- if (!*len) {
+ if (*len <= 0) {
fskd->state = STATE_SEARCH_STARTBIT2;
return 0;
}
@@ -278,7 +281,7 @@
fskd->state = STATE_SEARCH_STARTBIT3;
return 0;
}
- for (; i; i--) {
+ for (; i>0; i--) {
if (demodulator(fskd, &fskd->x1, GET_SAMPLE))
return(-1);
#if 0
More information about the svn-commits
mailing list