# HG changeset patch # User nicodvb # Date 1199121955 0 # Node ID f59175f21e06ea50a8e29c6d931ec91f7b03ca5b # Parent d132820611d3db6ba201081296463a872ff5138a more 0->NULL in functions returning pointers diff -r d132820611d3 -r f59175f21e06 dvdread/dvd_reader.c --- a/dvdread/dvd_reader.c Sun Dec 30 14:29:20 2007 +0000 +++ b/dvdread/dvd_reader.c Mon Dec 31 17:25:55 2007 +0000 @@ -227,11 +227,11 @@ dev = dvdinput_open( location ); if( !dev ) { fprintf( stderr, "libdvdread: Can't open %s for reading\n", location ); - return 0; + return NULL; } dvd = (dvd_reader_t *) malloc( sizeof( dvd_reader_t ) ); - if( !dvd ) return 0; + if( !dvd ) return NULL; dvd->isImageFile = 1; dvd->dev = dev; dvd->path_root = 0; @@ -256,7 +256,7 @@ dvd_reader_t *dvd; dvd = (dvd_reader_t *) malloc( sizeof( dvd_reader_t ) ); - if( !dvd ) return 0; + if( !dvd ) return NULL; dvd->isImageFile = 0; dvd->dev = 0; dvd->path_root = strdup( path_root ); @@ -364,7 +364,7 @@ fprintf( stderr, "libdvdread: Can't stat %s\n", path ); perror(""); free(path); - return 0; + return NULL; } /* First check if this is a block/char device or a file*/ @@ -398,7 +398,7 @@ /* XXX: We should scream real loud here. */ if( !(path_copy = strdup( path ) ) ) { free(path); - return 0; + return NULL; } #ifndef WIN32 /* don't have fchdir, and getcwd( NULL, ... ) is strange */ @@ -527,7 +527,7 @@ /* If it's none of the above, screw it. */ fprintf( stderr, "libdvdread: Could not open %s\n", path ); free( path ); - return 0; + return NULL; } void DVDClose( dvd_reader_t *dvd ) @@ -551,13 +551,13 @@ start = UDFFindFile( dvd, filename, &len ); if( !start ) { fprintf( stderr, "libdvdnav:DVDOpenFileUDF:UDFFindFile %s failed\n", filename ); - return 0; + return NULL; } dvd_file = (dvd_file_t *) malloc( sizeof( dvd_file_t ) ); if( !dvd_file ) { fprintf( stderr, "libdvdnav:DVDOpenFileUDF:malloc failed\n" ); - return 0; + return NULL; } dvd_file->dvd = dvd; dvd_file->lb_start = start; @@ -641,19 +641,19 @@ /* Get the full path of the file. */ if( !findDVDFile( dvd, filename, full_path ) ) { fprintf( stderr, "libdvdnav:DVDOpenFilePath:findDVDFile %s failed\n", filename ); - return 0; + return NULL; } dev = dvdinput_open( full_path ); if( !dev ) { fprintf( stderr, "libdvdnav:DVDOpenFilePath:dvdinput_open %s failed\n", full_path ); - return 0; + return NULL; } dvd_file = (dvd_file_t *) malloc( sizeof( dvd_file_t ) ); if( !dvd_file ) { fprintf( stderr, "libdvdnav:DVDOpenFilePath:dvd_file malloc failed\n" ); - return 0; + return NULL; } dvd_file->dvd = dvd; dvd_file->lb_start = 0; @@ -665,7 +665,7 @@ if( stat( full_path, &fileinfo ) < 0 ) { fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename ); free( dvd_file ); - return 0; + return NULL; } dvd_file->title_sizes[ 0 ] = fileinfo.st_size / DVD_VIDEO_LB_LEN; dvd_file->title_devs[ 0 ] = dev; @@ -686,10 +686,10 @@ sprintf( filename, "/VIDEO_TS/VTS_%02d_%d.VOB", title, menu ? 0 : 1 ); } start = UDFFindFile( dvd, filename, &len ); - if( start == 0 ) return 0; + if( start == 0 ) return NULL; dvd_file = (dvd_file_t *) malloc( sizeof( dvd_file_t ) ); - if( !dvd_file ) return 0; + if( !dvd_file ) return NULL; dvd_file->dvd = dvd; /*Hack*/ dvd_file->css_title = title << 1 | menu; dvd_file->lb_start = start; @@ -732,7 +732,7 @@ int i; dvd_file = (dvd_file_t *) malloc( sizeof( dvd_file_t ) ); - if( !dvd_file ) return 0; + if( !dvd_file ) return NULL; dvd_file->dvd = dvd; /*Hack*/ dvd_file->css_title = title << 1 | menu; dvd_file->lb_start = 0; @@ -751,19 +751,19 @@ } if( !findDVDFile( dvd, filename, full_path ) ) { free( dvd_file ); - return 0; + return NULL; } dev = dvdinput_open( full_path ); if( dev == NULL ) { free( dvd_file ); - return 0; + return NULL; } if( stat( full_path, &fileinfo ) < 0 ) { fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename ); free( dvd_file ); - return 0; + return NULL; } dvd_file->title_sizes[ 0 ] = fileinfo.st_size / DVD_VIDEO_LB_LEN; dvd_file->title_devs[ 0 ] = dev; @@ -790,7 +790,7 @@ } if( !dvd_file->title_devs[ 0 ] ) { free( dvd_file ); - return 0; + return NULL; } }