[vlc-commits] commit: access_oss: return NULL instead of 0. ( =?UTF-8?Q?R=C3=A9mi=20Duraffort=20?=)

git at videolan.org git at videolan.org
Mon Nov 22 19:08:43 CET 2010


vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Mon Nov 22 15:06:11 2010 +0100| [c661b609bec6f8f02a66b1c02715879e691b796c] | committer: Rémi Duraffort 

access_oss: return NULL instead of 0.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c661b609bec6f8f02a66b1c02715879e691b796c
---

 modules/access/oss.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/access/oss.c b/modules/access/oss.c
index 17ee9d5..c400b5a 100644
--- a/modules/access/oss.c
+++ b/modules/access/oss.c
@@ -304,7 +304,7 @@ static block_t* GrabAudio( demux_t *p_demux )
     if( !p_block )
     {
         msg_Warn( p_demux, "cannot get block" );
-        return 0;
+        return NULL;
     }
 
     p_sys->p_block = p_block;
@@ -312,10 +312,10 @@ static block_t* GrabAudio( demux_t *p_demux )
     i_read = read( p_sys->i_fd, p_block->p_buffer,
                 p_sys->i_max_frame_size );
 
-    if( i_read <= 0 ) return 0;
+    if( i_read <= 0 ) return NULL;
 
     p_block->i_buffer = i_read;
-    p_sys->p_block = 0;
+    p_sys->p_block = NULL;
 
     /* Correct the date because of kernel buffering */
     i_correct = i_read;



More information about the vlc-commits mailing list