Missing a couple of const's in get_mcn when prototype changed.
cdio.h: doc fix.
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/* -*- c -*-
|
/* -*- c -*-
|
||||||
$Id: cdio.h,v 1.42 2004/04/25 00:46:34 rocky Exp $
|
$Id: cdio.h,v 1.43 2004/04/25 16:38:06 rocky Exp $
|
||||||
|
|
||||||
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
|
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
|
||||||
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
|
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
|
||||||
@@ -207,7 +207,7 @@ extern "C" {
|
|||||||
track_t cdio_get_first_track_num(const CdIo *obj);
|
track_t cdio_get_first_track_num(const CdIo *obj);
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
Return a string containing the default CD device if none is specified.
|
Return the number of tracks on the CD.
|
||||||
*/
|
*/
|
||||||
track_t cdio_get_num_tracks (const CdIo *obj);
|
track_t cdio_get_num_tracks (const CdIo *obj);
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
$Id: _cdio_freebsd.c,v 1.20 2004/04/25 15:41:26 rocky Exp $
|
$Id: _cdio_freebsd.c,v 1.21 2004/04/25 16:38:06 rocky Exp $
|
||||||
|
|
||||||
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
|
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
|
||||||
|
|
||||||
@@ -27,7 +27,7 @@
|
|||||||
# include "config.h"
|
# include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static const char _rcsid[] = "$Id: _cdio_freebsd.c,v 1.20 2004/04/25 15:41:26 rocky Exp $";
|
static const char _rcsid[] = "$Id: _cdio_freebsd.c,v 1.21 2004/04/25 16:38:06 rocky Exp $";
|
||||||
|
|
||||||
#include <cdio/sector.h>
|
#include <cdio/sector.h>
|
||||||
#include <cdio/util.h>
|
#include <cdio/util.h>
|
||||||
@@ -377,9 +377,9 @@ _get_first_track_num_freebsd(void *env)
|
|||||||
|
|
||||||
*/
|
*/
|
||||||
static char *
|
static char *
|
||||||
_get_mcn_freebsd (void *env) {
|
_get_mcn_freebsd (const void *env) {
|
||||||
|
|
||||||
_img_private_t *_obj = env;
|
const _img_private_t *_obj = env;
|
||||||
struct ioc_read_subchannel subchannel;
|
struct ioc_read_subchannel subchannel;
|
||||||
struct cd_sub_channel_info subchannel_info;
|
struct cd_sub_channel_info subchannel_info;
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
$Id: _cdio_osx.c,v 1.16 2004/04/25 15:41:26 rocky Exp $
|
$Id: _cdio_osx.c,v 1.17 2004/04/25 16:38:06 rocky Exp $
|
||||||
|
|
||||||
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
|
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
|
||||||
from vcdimager code:
|
from vcdimager code:
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
# include "config.h"
|
# include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.16 2004/04/25 15:41:26 rocky Exp $";
|
static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.17 2004/04/25 16:38:06 rocky Exp $";
|
||||||
|
|
||||||
#include <cdio/sector.h>
|
#include <cdio/sector.h>
|
||||||
#include <cdio/util.h>
|
#include <cdio/util.h>
|
||||||
@@ -579,8 +579,8 @@ _get_first_track_num_osx(void *env)
|
|||||||
Return the media catalog number MCN.
|
Return the media catalog number MCN.
|
||||||
*/
|
*/
|
||||||
static char *
|
static char *
|
||||||
_get_mcn_osx (void *env) {
|
_get_mcn_osx (const void *env) {
|
||||||
_img_private_t *_obj = env;
|
const _img_private_t *_obj = env;
|
||||||
dk_cd_read_mcn_t cd_read;
|
dk_cd_read_mcn_t cd_read;
|
||||||
|
|
||||||
memset( &cd_read, 0, sizeof(cd_read) );
|
memset( &cd_read, 0, sizeof(cd_read) );
|
||||||
|
|||||||
Reference in New Issue
Block a user