[libdvdnav-devel] Use 0 instead of NULL in integer comparison

Paul Menzel git at videolan.org
Sun Dec 29 18:18:24 CET 2013


libdvdread | branch: master | Paul Menzel <paulepanter at users.sourceforge.net> | Wed Dec  4 22:44:23 2013 +0000| [7431b74772663e050da78f97096aebc358561050] | committer: Jean-Baptiste Kempf

Use 0 instead of NULL in integer comparison

Both GCC 4.8.2 and Clang 3.4 warn about a format mismatch in a
comparison.

        libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -mno-ms-bitfields -O3 -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOUR
CE -MT ifo_read.lo -MD -MP -MF .deps/ifo_read.Tpo -c ifo_read.c  -fPIC -DPIC -o .libs/ifo_read.o
        […]
        ifo_read.c: In function 'ifoRead_PTL_MAIT':
        ifo_read.c:1313:34: warning: comparison between pointer and integer [enabled by default]
           if(ifofile->vmgi_mat->ptl_mait == NULL)

        libtool: compile:  clang -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -O3 -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -MT ifo_read.
lo -MD -MP -MF .deps/ifo_read.Tpo -c ifo_read.c  -fPIC -DPIC -o .libs/ifo_read.o
        […]
        ifo_read.c:1313:34: warning: comparison between pointer and integer ('uint32_t' (aka 'unsigned int') and 'void *')
          if(ifofile->vmgi_mat->ptl_mait == NULL)
             ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^  ~~~~

Fix this by using the integer 0 instead of `NULL`.

> http://git.videolan.org/gitweb.cgi/libdvdread.git/?a=commit;h=7431b74772663e050da78f97096aebc358561050
---

 src/ifo_read.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ifo_read.c b/src/ifo_read.c
index 51f0857..776d67d 100644
--- a/src/ifo_read.c
+++ b/src/ifo_read.c
@@ -1309,7 +1309,7 @@ int ifoRead_PTL_MAIT(ifo_handle_t *ifofile) {
   if(!ifofile->vmgi_mat)
     return 0;
 
-  if(ifofile->vmgi_mat->ptl_mait == NULL)
+  if(ifofile->vmgi_mat->ptl_mait == 0)
     return 1;
 
   if(!DVDFileSeek_(ifofile->file, ifofile->vmgi_mat->ptl_mait * DVD_BLOCK_LEN))



More information about the libdvdnav-devel mailing list