[DVDnav-discuss] r1290 - trunk/libdvdread/src/ifo_read.c

rathann subversion at mplayerhq.hu
Wed Dec 4 23:44:23 CET 2013


Author: rathann
Date: Wed Dec  4 23:44:23 2013
New Revision: 1290

Log:
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`.

Patch by Paul Menzel <paulepanter AT users DOT sourceforge DOT net>

Modified:
   trunk/libdvdread/src/ifo_read.c

Modified: trunk/libdvdread/src/ifo_read.c
==============================================================================
--- trunk/libdvdread/src/ifo_read.c	Wed Dec  4 23:40:17 2013	(r1289)
+++ trunk/libdvdread/src/ifo_read.c	Wed Dec  4 23:44:23 2013	(r1290)
@@ -1310,7 +1310,7 @@ int ifoRead_PTL_MAIT(ifo_handle_t *ifofi
   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 DVDnav-discuss mailing list