claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

src/* gl_default_log_handler defined only once.

Browse Source 
lib/dirver/*.c: looks to me like a cosmetic change but supposedly it helps
on Fedora Core 4 test1
Bug # 12363:
See: http://savannah.gnu.org/bugs/?func=detailitem&item_id=12363
This commit is contained in:
rocky
2005-03-18 12:56:00 +00:00
parent e936b135a7
commit 8ef435a249
5 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/driver/_cdio_stream.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_stream.c,v 1.6 2005/02/05 04:25:14 rocky Exp $ $Id: _cdio_stream.c,v 1.7 2005/03/18 12:56:00 rocky Exp $
Copyright (C) 2000, 2004, 2005 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2000, 2004, 2005 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -35,7 +35,7 @@
#include <cdio/util.h> #include <cdio/util.h>
#include "_cdio_stream.h" #include "_cdio_stream.h"
static const char _rcsid[] = "$Id: _cdio_stream.c,v 1.6 2005/02/05 04:25:14 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_stream.c,v 1.7 2005/03/18 12:56:00 rocky Exp $";
/* /*
* DataSource implementations * DataSource implementations
@@ -146,7 +146,7 @@ cdio_stream_read(CdioDataSource_t* p_obj, void *ptr, long size, long nmemb)
if (!p_obj) return 0; if (!p_obj) return 0;
if (!_cdio_stream_open_if_necessary(p_obj)) return 0; if (!_cdio_stream_open_if_necessary(p_obj)) return 0;
read_bytes = p_obj->op.read(p_obj->user_data, ptr, size*nmemb); read_bytes = (p_obj->op.read)(p_obj->user_data, ptr, size*nmemb);
p_obj->position += read_bytes; p_obj->position += read_bytes;
return read_bytes; return read_bytes;

17
lib/driver/read.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: read.c,v 1.6 2005/02/17 07:03:37 rocky Exp $ $Id: read.c,v 1.7 2005/03/18 12:56:00 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -81,7 +81,7 @@ cdio_lseek (const CdIo_t *p_cdio, off_t offset, int whence)
if (!p_cdio) return DRIVER_OP_UNINIT; if (!p_cdio) return DRIVER_OP_UNINIT;
if (p_cdio->op.lseek) if (p_cdio->op.lseek)
return p_cdio->op.lseek (p_cdio->env, offset, whence); return (p_cdio->op.lseek) (p_cdio->env, offset, whence);
return DRIVER_OP_UNSUPPORTED; return DRIVER_OP_UNSUPPORTED;
} }
@@ -96,7 +96,7 @@ cdio_read (const CdIo_t *p_cdio, void *p_buf, size_t i_size)
if (!p_cdio) return DRIVER_OP_UNINIT; if (!p_cdio) return DRIVER_OP_UNINIT;
if (p_cdio->op.read) if (p_cdio->op.read)
return p_cdio->op.read (p_cdio->env, p_buf, i_size); return (p_cdio->op.read) (p_cdio->env, p_buf, i_size);
return DRIVER_OP_UNSUPPORTED; return DRIVER_OP_UNSUPPORTED;
} }
@@ -123,7 +123,8 @@ cdio_read_audio_sectors (const CdIo_t *p_cdio, void *p_buf, lsn_t i_lsn,
{ {
check_lsn_blocks(i_lsn, i_blocks); check_lsn_blocks(i_lsn, i_blocks);
if (p_cdio->op.read_audio_sectors) if (p_cdio->op.read_audio_sectors)
return p_cdio->op.read_audio_sectors (p_cdio->env, p_buf, i_lsn, i_blocks); return (p_cdio->op.read_audio_sectors) (p_cdio->env, p_buf, i_lsn,
i_blocks);
return DRIVER_OP_UNSUPPORTED; return DRIVER_OP_UNSUPPORTED;
} }
@@ -189,8 +190,8 @@ cdio_read_mode1_sectors (const CdIo_t *p_cdio, void *p_buf, lsn_t i_lsn,
{ {
check_lsn_blocks(i_lsn, i_blocks); check_lsn_blocks(i_lsn, i_blocks);
if (p_cdio->op.read_mode1_sectors) if (p_cdio->op.read_mode1_sectors)
return p_cdio->op.read_mode1_sectors (p_cdio->env, p_buf, i_lsn, b_form2, return (p_cdio->op.read_mode1_sectors) (p_cdio->env, p_buf, i_lsn, b_form2,
i_blocks); i_blocks);
return DRIVER_OP_UNSUPPORTED; return DRIVER_OP_UNSUPPORTED;
} }
@@ -233,8 +234,8 @@ cdio_read_mode2_sectors (const CdIo_t *p_cdio, void *p_buf, lsn_t i_lsn,
{ {
check_lsn_blocks(i_lsn, i_blocks); check_lsn_blocks(i_lsn, i_blocks);
if (p_cdio->op.read_mode2_sectors) if (p_cdio->op.read_mode2_sectors)
return p_cdio->op.read_mode2_sectors (p_cdio->env, p_buf, i_lsn, return (p_cdio->op.read_mode2_sectors) (p_cdio->env, p_buf, i_lsn,
b_form2, i_blocks); b_form2, i_blocks);
return DRIVER_OP_UNSUPPORTED; return DRIVER_OP_UNSUPPORTED;
} }

4
src/cd-drive.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cd-drive.c,v 1.17 2005/01/22 22:21:36 rocky Exp $ $Id: cd-drive.c,v 1.18 2005/03/18 12:56:00 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -131,8 +131,6 @@ parse_options (int argc, const char *argv[])
/* CDIO logging routines */ /* CDIO logging routines */
static cdio_log_handler_t gl_default_cdio_log_handler = NULL;
static void static void
_log_handler (cdio_log_level_t level, const char message[]) _log_handler (cdio_log_level_t level, const char message[])
{ {

3
src/cd-info.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cd-info.c,v 1.135 2005/03/15 04:17:05 rocky Exp $ $Id: cd-info.c,v 1.136 2005/03/18 12:56:00 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org> Copyright (C) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org>
@@ -343,7 +343,6 @@ parse_options (int argc, const char *argv[])
/* CDIO logging routines */ /* CDIO logging routines */
static cdio_log_handler_t gl_default_cdio_log_handler = NULL;
#ifdef HAVE_CDDB #ifdef HAVE_CDDB
static cddb_log_handler_t gl_default_cddb_log_handler = NULL; static cddb_log_handler_t gl_default_cddb_log_handler = NULL;
#endif #endif

4
src/iso-info.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: iso-info.c,v 1.29 2005/02/27 20:16:08 rocky Exp $ $Id: iso-info.c,v 1.30 2005/03/18 12:56:00 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -158,8 +158,6 @@ parse_options (int argc, const char *argv[])
/* CDIO logging routines */ /* CDIO logging routines */
static cdio_log_handler_t gl_default_cdio_log_handler = NULL;
static void static void
_log_handler (cdio_log_level_t level, const char message[]) _log_handler (cdio_log_level_t level, const char message[])
{ {