Author: robux4
Date: 2004-09-14 16:31:09 +0400 (Tue, 14 Sep 2004)
New Revision: 803
Modified:
trunk/DvdMenuXtractor/libdvdread/dvdread/dvd_reader.c
trunk/DvdMenuXtractor/libdvdread/dvdread/ifo_print.c
trunk/DvdMenuXtractor/libdvdread/libdvdread.bkl
trunk/DvdMenuXtractor/libdvdread/makefile.vc
trunk/DvdMenuXtractor/libdvdread/win32/config.h
Log:
get the error logs back to the main app
Modified: trunk/DvdMenuXtractor/libdvdread/dvdread/dvd_reader.c
===================================================================
--- trunk/DvdMenuXtractor/libdvdread/dvdread/dvd_reader.c 2004-09-14 12:29:32 UTC (rev 802)
+++ trunk/DvdMenuXtractor/libdvdread/dvdread/dvd_reader.c 2004-09-14 12:31:09 UTC (rev 803)
@@ -163,9 +163,9 @@
if(nokeys_str != NULL)
return 0;
- fprintf( stderr, "\n" );
- fprintf( stderr, "libdvdread: Attempting to retrieve all CSS keys\n" );
- fprintf( stderr, "libdvdread: This can take a _long_ time, "
+ LOG_ERROR( "\n" );
+ LOG_ERROR( "libdvdread: Attempting to retrieve all CSS keys\n" );
+ LOG_ERROR( "libdvdread: This can take a _long_ time, "
"please be patient\n\n" );
GETTIME( all_time.start );
@@ -180,13 +180,13 @@
start = UDFFindFile( dvd, filename, &len );
if( start != 0 && len != 0 ) {
/* Perform CSS key cracking for this title. */
- fprintf( stderr, "libdvdread: Get key for %s at 0x%08x\n",
+ LOG_ERROR( "libdvdread: Get key for %s at 0x%08x\n",
filename, start );
if( dvdinput_title( dvd->dev, (int)start ) < 0 ) {
- fprintf( stderr, "libdvdread: Error cracking CSS key for %s (0x%08x)\n", filename, start);
+ LOG_ERROR( "libdvdread: Error cracking CSS key for %s (0x%08x)\n", filename, start);
}
GETTIME( t_time.end );
- fprintf( stderr, "libdvdread: Elapsed time %ld\n",
+ LOG_ERROR( "libdvdread: Elapsed time %ld\n",
(long int) TIMEDIFF(t_time) );
}
@@ -198,20 +198,20 @@
if( start == 0 || len == 0 ) break;
/* Perform CSS key cracking for this title. */
- fprintf( stderr, "libdvdread: Get key for %s at 0x%08x\n",
+ LOG_ERROR( "libdvdread: Get key for %s at 0x%08x\n",
filename, start );
if( dvdinput_title( dvd->dev, (int)start ) < 0 ) {
- fprintf( stderr, "libdvdread: Error cracking CSS key for %s (0x%08x)!!\n", filename, start);
+ LOG_ERROR( "libdvdread: Error cracking CSS key for %s (0x%08x)!!\n", filename, start);
}
GETTIME( t_time.end );
- fprintf( stderr, "libdvdread: Elapsed time %ld\n",
+ LOG_ERROR( "libdvdread: Elapsed time %ld\n",
(long int) TIMEDIFF(t_time) );
}
title--;
- fprintf( stderr, "libdvdread: Found %d VTS's\n", title );
+ LOG_ERROR( "libdvdread: Found %d VTS's\n", title );
GETTIME( all_time.end );
- fprintf( stderr, "libdvdread: Elapsed time %ld\n",
+ LOG_ERROR( "libdvdread: Elapsed time %ld\n",
(long int) TIMEDIFF(all_time) );
return 0;
@@ -229,7 +229,7 @@
dev = dvdinput_open( location );
if( !dev ) {
- fprintf( stderr, "libdvdread: Can't open %s for reading\n", location );
+ LOG_ERROR( "libdvdread: Can't open %s for reading\n", location );
return 0;
}
@@ -330,7 +330,7 @@
ret = stat( path, &fileinfo );
if( ret < 0 ) {
/* If we can't stat the file, give up */
- fprintf( stderr, "libdvdread: Can't stat %s\n", path );
+ LOG_ERROR( "libdvdread: Can't stat %s\n", path );
perror("");
return 0;
}
@@ -405,8 +405,7 @@
#if defined(SYS_BSD)
if( ( fe = getfsfile( path_copy ) ) ) {
dev_name = bsd_block2char( fe->fs_spec );
- fprintf( stderr,
- "libdvdread: Attempting to use device %s"
+ LOG_ERROR( "libdvdread: Attempting to use device %s"
" mounted on %s for CSS authentication\n",
dev_name,
fe->fs_file );
@@ -421,7 +420,7 @@
while( ( res = getmntent( mntfile, &mp ) ) != -1 ) {
if( res == 0 && !strcmp( mp.mnt_mountp, path_copy ) ) {
dev_name = sun_block2char( mp.mnt_special );
- fprintf( stderr,
+ LOG_ERROR(
"libdvdread: Attempting to use device %s"
" mounted on %s for CSS authentication\n",
dev_name,
@@ -439,7 +438,7 @@
while( ( me = getmntent( mntfile ) ) ) {
if( !strcmp( me->mnt_dir, path_copy ) ) {
- fprintf( stderr,
+ LOG_ERROR(
"libdvdread: Attempting to use device %s"
" mounted on %s for CSS authentication\n",
me->mnt_fsname,
@@ -453,9 +452,9 @@
}
#endif
if( !dev_name ) {
- fprintf( stderr, "libdvdread: Couldn't find device name.\n" );
+ LOG_ERROR( "libdvdread: Couldn't find device name.\n" );
} else if( !auth_drive ) {
- fprintf( stderr, "libdvdread: Device %s inaccessible, "
+ LOG_ERROR( "libdvdread: Device %s inaccessible, "
"CSS authentication not available.\n", dev_name );
}
@@ -474,7 +473,7 @@
}
/* If it's none of the above, screw it. */
- fprintf( stderr, "libdvdread: Could not open %s\n", path );
+ LOG_ERROR( "libdvdread: Could not open %s\n", path );
return 0;
}
@@ -594,7 +593,7 @@
dvd_file->filesize = 0;
if( stat( full_path, &fileinfo ) < 0 ) {
- fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename );
+ LOG_ERROR( "libdvdread: Can't stat() %s.\n", filename );
free( dvd_file );
return 0;
}
@@ -646,7 +645,7 @@
}
/*
if( dvdinput_title( dvd_file->dvd->dev, (int)start ) < 0 ) {
- fprintf( stderr, "libdvdread: Error cracking CSS key for %s\n",
+ LOG_ERROR( "libdvdread: Error cracking CSS key for %s\n",
filename );
}
*/
@@ -692,7 +691,7 @@
}
if( stat( full_path, &fileinfo ) < 0 ) {
- fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename );
+ LOG_ERROR( "libdvdread: Can't stat() %s.\n", filename );
free( dvd_file );
return 0;
}
@@ -710,7 +709,7 @@
}
if( stat( full_path, &fileinfo ) < 0 ) {
- fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename );
+ LOG_ERROR( "libdvdread: Can't stat() %s.\n", filename );
break;
}
@@ -768,7 +767,7 @@
}
break;
default:
- fprintf( stderr, "libdvdread: Invalid domain for file open.\n" );
+ LOG_ERROR( "libdvdread: Invalid domain for file open.\n" );
return NULL;
}
@@ -807,13 +806,13 @@
int ret;
if( !device->dev ) {
- fprintf( stderr, "libdvdread: Fatal error in block read.\n" );
+ LOG_ERROR( "libdvdread: Fatal error in block read.\n" );
return 0;
}
ret = dvdinput_seek( device->dev, (int) lb_number );
if( ret != (int) lb_number ) {
- fprintf( stderr, "libdvdread: Can't seek to block %u\n", lb_number );
+ LOG_ERROR( "libdvdread: Can't seek to block %u\n", lb_number );
return 0;
}
@@ -857,7 +856,7 @@
if( ( offset + block_count ) <= dvd_file->title_sizes[ i ] ) {
off = dvdinput_seek( dvd_file->title_devs[ i ], (int)offset );
if( off < 0 || off != (int)offset ) {
- fprintf( stderr, "libdvdread: Can't seek to block %d\n",
+ LOG_ERROR( "libdvdread: Can't seek to block %d\n",
offset );
return off < 0 ? off : 0;
}
@@ -872,7 +871,7 @@
/* Read part 1 */
off = dvdinput_seek( dvd_file->title_devs[ i ], (int)offset );
if( off < 0 || off != (int)offset ) {
- fprintf( stderr, "libdvdread: Can't seek to block %d\n",
+ LOG_ERROR( "libdvdread: Can't seek to block %d\n",
offset );
return off < 0 ? off : 0;
}
@@ -888,7 +887,7 @@
/* Read part 2 */
off = dvdinput_seek( dvd_file->title_devs[ i + 1 ], 0 );
if( off < 0 || off != 0 ) {
- fprintf( stderr, "libdvdread: Can't seek to block %d\n",
+ LOG_ERROR( "libdvdread: Can't seek to block %d\n",
0 );
return off < 0 ? off : 0;
}
@@ -972,7 +971,7 @@
secbuf = (unsigned char *) malloc( numsec * DVD_VIDEO_LB_LEN );
if( !secbuf ) {
- fprintf( stderr, "libdvdread: Can't allocate memory "
+ LOG_ERROR( "libdvdread: Can't allocate memory "
"for file read!\n" );
return 0;
}
@@ -1026,13 +1025,13 @@
char *buffer = malloc( file_size );
if( buffer == NULL ) {
- fprintf( stderr, "libdvdread: DVDDiscId, failed to "
+ LOG_ERROR( "libdvdread: DVDDiscId, failed to "
"allocate memory for file read!\n" );
return -1;
}
bytes_read = DVDReadBytes( dvd_file, buffer, file_size );
if( bytes_read != file_size ) {
- fprintf( stderr, "libdvdread: DVDDiscId read returned %d bytes"
+ LOG_ERROR( "libdvdread: DVDDiscId read returned %d bytes"
", wanted %d\n", bytes_read, file_size );
DVDCloseFile( dvd_file );
return -1;
@@ -1068,14 +1067,14 @@
buffer = malloc( DVD_VIDEO_LB_LEN );
if( buffer == NULL ) {
- fprintf( stderr, "libdvdread: DVDISOVolumeInfo, failed to "
+ LOG_ERROR( "libdvdread: DVDISOVolumeInfo, failed to "
"allocate memory for file read!\n" );
return -1;
}
ret = UDFReadBlocksRaw( dvd, 16, 1, buffer, 0 );
if( ret != 1 ) {
- fprintf( stderr, "libdvdread: DVDISOVolumeInfo, failed to "
+ LOG_ERROR( "libdvdread: DVDISOVolumeInfo, failed to "
"read ISO9660 Primary Volume Descriptor!\n" );
return -1;
}
Modified: trunk/DvdMenuXtractor/libdvdread/dvdread/ifo_print.c
===================================================================
--- trunk/DvdMenuXtractor/libdvdread/dvdread/ifo_print.c 2004-09-14 12:29:32 UTC (rev 802)
+++ trunk/DvdMenuXtractor/libdvdread/dvdread/ifo_print.c 2004-09-14 12:31:09 UTC (rev 803)
@@ -1028,7 +1028,7 @@
ifohandle = ifoOpen(dvd, title);
if(!ifohandle) {
- fprintf(stderr, "Can't open info file for title %d\n", title);
+ LOG_ERROR( "Can't open info file for title %d\n", title);
return;
}
@@ -1148,3 +1148,9 @@
ifoClose(ifohandle);
}
+int internal_error(const char*format, ...)
+{
+ va_list args;
+ va_start(args, format);
+ return vfprintf(stderr, format, args);
+}
Modified: trunk/DvdMenuXtractor/libdvdread/libdvdread.bkl
===================================================================
--- trunk/DvdMenuXtractor/libdvdread/libdvdread.bkl 2004-09-14 12:29:32 UTC (rev 802)
+++ trunk/DvdMenuXtractor/libdvdread/libdvdread.bkl 2004-09-14 12:31:09 UTC (rev 803)
@@ -7,6 +7,11 @@
<description>Type of compiled binaries</description>
</option>
+ <option name="LOG_ERROR">
+ <default-value>internal_error</default-value>
+ <description>Link the debug output somewhere else</description>
+ </option>
+
<set var="BUILDDIR">build</set>
<set var="DEBUG_FLAG">
<if cond="BUILD=='debug'">on</if>
@@ -25,6 +30,7 @@
<debug-runtime-libs>$(DEBUG_FLAG)</debug-runtime-libs>
<optimize>$(OPTIMIZE)</optimize>
<define>HAVE_CONFIG_H</define>
+ <define>LOG_ERROR=$(LOG_ERROR)</define>
<sources>dvdread\ifo_read.c dvdread\dvd_udf.c dvdread\ifo_print.c dvdread\nav_read.c dvdread\nav_print.c dvdread\md5.c dvdread\dvd_reader.c dvdread\dvd_input.c</sources>
<if cond="PLATFORM_WIN32=='1'">
Modified: trunk/DvdMenuXtractor/libdvdread/makefile.vc
===================================================================
--- trunk/DvdMenuXtractor/libdvdread/makefile.vc 2004-09-14 12:29:32 UTC (rev 802)
+++ trunk/DvdMenuXtractor/libdvdread/makefile.vc 2004-09-14 12:31:09 UTC (rev 803)
@@ -25,8 +25,11 @@
# Type of compiled binaries [debug,release]
BUILD = release
+# Link the debug output somewhere else
+LOG_ERROR = internal_error
+
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
@@ -35,7 +38,7 @@
LIBDVDREAD_CFLAGS = /MD$(__DEBUG_FLAG_8) /DWIN32 $(__DEBUG_FLAG) \
/Fdbuild\libdvdread.pdb $(____DEBUG_FLAG) $(__OPTIMIZE) /DHAVE_CONFIG_H \
- /Iwin32 /I. $(CPPFLAGS) $(CFLAGS)
+ /DLOG_ERROR=$(LOG_ERROR) /Iwin32 /I. $(CPPFLAGS) $(CFLAGS)
LIBDVDREAD_OBJECTS = \
build\libdvdread_ifo_read.obj \
build\libdvdread_dvd_udf.obj \
Modified: trunk/DvdMenuXtractor/libdvdread/win32/config.h
===================================================================
--- trunk/DvdMenuXtractor/libdvdread/win32/config.h 2004-09-14 12:29:32 UTC (rev 802)
+++ trunk/DvdMenuXtractor/libdvdread/win32/config.h 2004-09-14 12:31:09 UTC (rev 803)
@@ -107,3 +107,8 @@
/* #undef size_t */
#define PATH_MAX 512
+
+#ifndef LOG_ERROR
+#define LOG_ERROR internal_error
+extern int internal_error(const char*format, ...);
+#endif
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.