[asterisk-commits] twilson: branch 1.6.1 r158993 - in /branches/1.6.1: ./ channels/chan_usbradio.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Mon Nov 24 21:51:59 2008
New Revision: 158993

URL: http://svn.digium.com/view/asterisk?view=rev&rev=158993
Log:
Merged revisions 158992 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r158992 | twilson | 2008-11-24 21:49:30 -0600 (Mon, 24 Nov 2008) | 2 lines
  
  Make chan_usbradio compile under dev mode
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_usbradio.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_usbradio.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_usbradio.c?view=diff&rev=158993&r1=158992&r2=158993
==============================================================================
--- branches/1.6.1/channels/chan_usbradio.c (original)
+++ branches/1.6.1/channels/chan_usbradio.c Mon Nov 24 21:51:59 2008
@@ -1107,7 +1107,9 @@
 	//printf("kickptt  %i  %i  %i\n",o->txkeyed,o->txchankey,o->txtestkey);
 	if (!o) return;
 	if (!o->pttkick) return;
-	write(o->pttkick[1],&c,1);
+	if (write(o->pttkick[1],&c,1) < 0) {
+		ast_log(LOG_ERROR, "write() failed: %s\n", strerror(errno));
+	}
 }
 /*
 */
@@ -1174,7 +1176,9 @@
 		{
 			char c;
 
-			read(o->pttkick[0],&c,1);
+			if (read(o->pttkick[0],&c,1) < 0) {
+				ast_log(LOG_ERROR, "read() failed: %s\n", strerror(errno));
+			}
 		}
 		if(o->wanteeprom)
 		{
@@ -1779,7 +1783,9 @@
 			tbuff[i]= ((i16*)(f->data.ptr))[i/2];
 			tbuff[i+1]= o->txkeyed*M_Q13;
 		}
-		fwrite(tbuff,2,f->datalen,ftxcapraw);
+		if (fwrite(tbuff,2,f->datalen,ftxcapraw) != f->datalen) {
+			ast_log(LOG_ERROR, "write() failed: %s\n", strerror(errno));
+		}
 		//fwrite(f->data,1,f->datalen,ftxcapraw);
 	}
 	#endif
@@ -1842,7 +1848,9 @@
 		return f;
 
 	#if DEBUG_CAPTURES == 1
-	if (o->b.rxcapraw && frxcapraw) fwrite((o->usbradio_read_buf + AST_FRIENDLY_OFFSET),1,FRAME_SIZE * 2 * 2 * 6,frxcapraw);
+	if ((o->b.rxcapraw && frxcapraw) && (fwrite((o->usbradio_read_buf + AST_FRIENDLY_OFFSET),1,FRAME_SIZE * 2 * 2 * 6,frxcapraw) != FRAME_SIZE * 2 * 2 * 6)) {
+		ast_log(LOG_ERROR, "fwrite() failed: %s\n", strerror(errno));
+	}
 	#endif
 
 	#if 1
@@ -1878,7 +1886,9 @@
 	#endif
 
 	#if DEBUG_CAPTURES == 1	&& XPMR_DEBUG0 == 1
-    if (o->b.txcap2 && ftxcaptrace) fwrite((o->pmrChan->ptxDebug),1,FRAME_SIZE * 2 * 16,ftxcaptrace);
+    if ((o->b.txcap2 && ftxcaptrace) && (fwrite((o->pmrChan->ptxDebug),1,FRAME_SIZE * 2 * 16,ftxcaptrace) != FRAME_SIZE * 2 * 16)) {
+	   ast_log(LOG_ERROR, "fwrite() failed: %s\n", strerror(errno));
+	}
 	#endif
 	
 	// 160 samples * 2 bytes/sample * 2 chan * 6x oversampling to 48KS/s
@@ -1936,7 +1946,9 @@
 	#endif
 
 	#if DEBUG_CAPTURES == 1 && XPMR_DEBUG0 == 1
-    if (frxcaptrace && o->b.rxcap2 && o->pmrChan->b.radioactive) fwrite((o->pmrChan->prxDebug),1,FRAME_SIZE * 2 * 16,frxcaptrace);
+    if ((frxcaptrace && o->b.rxcap2 && o->pmrChan->b.radioactive) && (fwrite((o->pmrChan->prxDebug),1,FRAME_SIZE * 2 * 16,frxcaptrace) != FRAME_SIZE * 2 * 16 )) {
+		ast_log(LOG_ERROR, "fwrite() failed: %s\n", strerror(errno));
+	}
 	#endif
 
 	cd = 0;
@@ -3772,7 +3784,9 @@
 
 		PmrRx(pChan,iBuff,oBuff);
 
-		fwrite((void *)pChan->prxDebug,2,numSamples*numChannels,hOutput);
+		if (fwrite((void *)pChan->prxDebug,2,numSamples*numChannels,hOutput) != numSamples * numChannels) {
+			ast_log(LOG_ERROR, "fwrite() failed: %s\n", strerror(errno));
+		}
 	}
 	pChan->b.txCapture=0;
 	pChan->b.rxCapture=0;