[Sumover-dev] [svn commit] r3966 - rat/trunk

[sumover-dev at cs.ucl.ac.uk]

Author: piers
Date: Fri Feb  9 17:26:21 2007
New Revision: 3966

Modified:
   rat/trunk/auddev_alsa.c
   rat/trunk/auddev_atm.c
   rat/trunk/auddev_ixj.c
   rat/trunk/auddev_luigi.c
   rat/trunk/auddev_netbsd.c
   rat/trunk/auddev_newpcm.c
   rat/trunk/auddev_osprey.c
   rat/trunk/auddev_pca.c
   rat/trunk/auddev_sparc.c

Log:
Added errno=0 before use of errno - which is normally required. Note: use of errno should always be prefixed with setting it zero as errno is not reset after a successful return from a function - and it may have been set to an error state in another function anywhere.

Modified: rat/trunk/auddev_alsa.c
==============================================================================
--- rat/trunk/auddev_alsa.c	(original)
+++ rat/trunk/auddev_alsa.c	Fri Feb  9 17:26:21 2007
@@ -765,15 +765,16 @@
 
   if ((err = snd_mixer_poll_descriptors(mixer_handle, fds, count)) < 0){
     debug_msg ("snd_mixer_poll_descriptors err=%d\n", err);
-  free(fds);
+    free(fds);
     return;
   }
 
   if (err != count){
     debug_msg ("snd_mixer_poll_descriptors (err(%d) != count(%d))\n",err,count);
-  free(fds);
+    free(fds);
     return;
   }
+  errno = 0;
 
   num_revents = poll(fds, count, 1);
 

Modified: rat/trunk/auddev_atm.c
==============================================================================
--- rat/trunk/auddev_atm.c	(original)
+++ rat/trunk/auddev_atm.c	Fri Feb  9 17:26:21 2007
@@ -249,6 +249,8 @@
 {
 	int len, avail, done = 0;
 	char cellbuf[ADA_CELL_SZ];
+	
+	errno = 0;
 
 	UNUSED(ad);
 

Modified: rat/trunk/auddev_ixj.c
==============================================================================
--- rat/trunk/auddev_ixj.c	(original)
+++ rat/trunk/auddev_ixj.c	Fri Feb  9 17:26:21 2007
@@ -476,6 +476,8 @@
 
 //	debug_msg("Reading %d bytes requested\n", read_bytes);
 	read_len=0;
+        errno = 0;
+
 	if(ioctl(devices[ad].audio_fd, PHONE_HOOKSTATE) || ixjiport != 1) {
 	  read_len  = read(devices[ad].audio_fd, &mybuf[offset], devices[ad].frame_len);
 	  if (read_len < 0 && errno != EAGAIN && errno != EINTR) {

Modified: rat/trunk/auddev_luigi.c
==============================================================================
--- rat/trunk/auddev_luigi.c	(original)
+++ rat/trunk/auddev_luigi.c	Fri Feb  9 17:26:21 2007
@@ -262,6 +262,8 @@
 luigi_audio_write(audio_desc_t ad, u_char *buf, int write_bytes)
 {
 	int done;
+        
+	errno = 0;
 
         UNUSED(ad); assert(audio_fd > 0);
 

Modified: rat/trunk/auddev_netbsd.c
==============================================================================
--- rat/trunk/auddev_netbsd.c	(original)
+++ rat/trunk/auddev_netbsd.c	Fri Feb  9 17:26:21 2007
@@ -567,6 +567,8 @@
 	int             bytes_read = 0;
 	int             this_read;
 
+        errno = 0;
+
 	assert(audio_devices && n_devices > ad);
 	fd = audio_devices[ad].audio_info.fd;
 	if (fd < 0)
@@ -600,6 +602,8 @@
 	int             fd;
 	int             bytes_written = 0;
 	int             this_write;
+        
+	errno = 0;
 
 	assert(audio_devices && n_devices > ad);
 	fd = audio_devices[ad].audio_info.fd;

Modified: rat/trunk/auddev_newpcm.c
==============================================================================
--- rat/trunk/auddev_newpcm.c	(original)
+++ rat/trunk/auddev_newpcm.c	Fri Feb  9 17:26:21 2007
@@ -700,6 +700,7 @@
 		perror("opendir /dev");
 		return 0;
 	}
+        errno = 0;
 
 	while ((de = readdir(d)) != NULL && ndev < NEWPCM_MAX_AUDIO_DEVICES) {
 		if (de->d_type != DT_CHR) continue;

Modified: rat/trunk/auddev_osprey.c
==============================================================================
--- rat/trunk/auddev_osprey.c	(original)
+++ rat/trunk/auddev_osprey.c	Fri Feb  9 17:26:21 2007
@@ -393,6 +393,7 @@
         int done = 0, len = buf_bytes;
 
         UNUSED(ad); assert(audio_fd > 0);
+        errno = 0;
 
 	while (len > 0) {
 		if ((done = oti_write(audio_fd, buf, len)) == len)

Modified: rat/trunk/auddev_pca.c
==============================================================================
--- rat/trunk/auddev_pca.c	(original)
+++ rat/trunk/auddev_pca.c	Fri Feb  9 17:26:21 2007
@@ -273,6 +273,7 @@
 	int	 nbytes;
 
         UNUSED(ad);
+        errno = 0;
 
         if ((nbytes = write(audio_fd, buf, write_bytes)) != write_bytes) {
 		if (errno == EWOULDBLOCK) {	/* XXX */

Modified: rat/trunk/auddev_sparc.c
==============================================================================
--- rat/trunk/auddev_sparc.c	(original)
+++ rat/trunk/auddev_sparc.c	Fri Feb  9 17:26:21 2007
@@ -273,6 +273,7 @@
 	int done, this_write;
 
         UNUSED(ad); assert(audio_fd > 0);
+        errno = 0;
 
         done = 0;
         while(done != buf_bytes) {