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

Regularize naming convention of static routines a little bit.

Browse Source
This commit is contained in:
rocky
2004-04-25 01:19:58 +00:00
parent 52e0a80503
commit 1bf5f1e464
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/_cdio_linux.c
View File

@@ -1,5 +1,5 @@
/*
$Id: _cdio_linux.c,v 1.34 2004/04/23 01:01:36 rocky Exp $
$Id: _cdio_linux.c,v 1.35 2004/04/25 01:19:58 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h"
#endif
static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.34 2004/04/23 01:01:36 rocky Exp $";
static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.35 2004/04/25 01:19:58 rocky Exp $";
#include <string.h>
@@ -810,7 +810,7 @@ _cdio_get_first_track_num(void *env)
*/
static char *
_cdio_get_mcn (void *env) {
_cdio_get_mcn_linux (void *env) {
struct cdrom_mcn mcn;
const _img_private_t *_obj = env;
@@ -828,7 +828,7 @@ _cdio_get_mcn (void *env) {
*/
static cdio_drive_cap_t
_cdio_get_drive_cap (const void *env) {
_cdio_get_drive_cap_linux (const void *env) {
const _img_private_t *_obj = env;
int32_t i_drivetype;
@@ -1080,9 +1080,9 @@ cdio_open_linux (const char *orig_source_name)
.get_arg = _cdio_get_arg,
.get_devices = cdio_get_devices_linux,
.get_default_device = cdio_get_default_device_linux,
.get_drive_cap = _cdio_get_drive_cap,
.get_drive_cap = _cdio_get_drive_cap_linux,
.get_first_track_num= _cdio_get_first_track_num,
.get_mcn = _cdio_get_mcn,
.get_mcn = _cdio_get_mcn_linux,
.get_num_tracks = _cdio_get_num_tracks,
.get_track_format = _cdio_get_track_format,
.get_track_green = _cdio_get_track_green,

14
lib/image/bincue.c
View File

@@ -1,5 +1,5 @@
/*
$Id: bincue.c,v 1.12 2004/04/25 00:46:34 rocky Exp $
$Id: bincue.c,v 1.13 2004/04/25 01:19:58 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -24,7 +24,7 @@
(*.cue).
*/
static const char _rcsid[] = "$Id: bincue.c,v 1.12 2004/04/25 00:46:34 rocky Exp $";
static const char _rcsid[] = "$Id: bincue.c,v 1.13 2004/04/25 01:19:58 rocky Exp $";
#include "cdio_assert.h"
#include "cdio_private.h"
@@ -634,7 +634,7 @@ _cdio_read_mode2_sectors (void *env, void *data, uint32_t lsn,
if (NULL != obj) { free(obj); obj=NULL; };
static void
_cdio_bincue_destroy (void *obj)
_cdio_destroy_bincue (void *obj)
{
_img_private_t *env = obj;
@@ -750,7 +750,7 @@ cdio_get_default_device_bincue(void)
*/
static cdio_drive_cap_t
_cdio_bincue_get_drive_cap (const void *env) {
_cdio_get_drive_cap_bincue (const void *env) {
/* There may be more in the future but these we can handle now.
Also, we know we can't handle
@@ -909,10 +909,10 @@ cdio_open_cue (const char *cue_name)
cdio_funcs _funcs = {
.eject_media = cdio_generic_bogus_eject_media,
.free = _cdio_bincue_destroy,
.free = _cdio_destroy_bincue,
.get_arg = _cdio_get_arg,
.get_default_device = cdio_get_default_device_bincue,
.get_drive_cap = _cdio_bincue_get_drive_cap,
.get_drive_cap = _cdio_get_drive_cap_bincue,
.get_first_track_num= _cdio_image_get_first_track_num,
.get_mcn = _cdio_image_get_mcn,
.get_num_tracks = _cdio_image_get_num_tracks,
@@ -955,7 +955,7 @@ cdio_open_cue (const char *cue_name)
if (_cdio_init(_data)) {
return ret;
} else {
_cdio_bincue_destroy(_data);
_cdio_destroy_bincue(_data);
free(ret);
return NULL;
}

12
lib/image/nrg.c
View File

@@ -1,5 +1,5 @@
/*
$Id: nrg.c,v 1.7 2004/04/25 00:46:34 rocky Exp $
$Id: nrg.c,v 1.8 2004/04/25 01:19:58 rocky Exp $
Copyright (C) 2001, 2003 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -48,7 +48,7 @@
#include "cdio_private.h"
#include "_cdio_stdio.h"
static const char _rcsid[] = "$Id: nrg.c,v 1.7 2004/04/25 00:46:34 rocky Exp $";
static const char _rcsid[] = "$Id: nrg.c,v 1.8 2004/04/25 01:19:58 rocky Exp $";
/* structures used */
@@ -992,7 +992,7 @@ _cdio_read_mode2_sectors (void *env, void *data, uint32_t lsn,
Free memory resources associated with NRG object.
*/
static void
_cdio_nrg_destroy (void *obj)
_cdio_destroy_nrg (void *obj)
{
_img_private_t *env = obj;
@@ -1084,7 +1084,7 @@ cdio_get_default_device_nrg(void)
*/
static cdio_drive_cap_t
_cdio_nrg_get_drive_cap (const void *env) {
_cdio_get_drive_cap_nrg (const void *env) {
/* There may be more in the future but these we can handle now.
Also, we know we can't handle
@@ -1147,11 +1147,11 @@ cdio_open_nrg (const char *source_name)
cdio_funcs _funcs = {
.eject_media = cdio_generic_bogus_eject_media,
.free = _cdio_nrg_destroy,
.free = _cdio_destroy_nrg,
.get_arg = _cdio_get_arg,
.get_devices = cdio_get_devices_nrg,
.get_default_device = cdio_get_default_device_nrg,
.get_drive_cap = _cdio_nrg_get_drive_cap,
.get_drive_cap = _cdio_get_drive_cap_nrg,
.get_first_track_num= _cdio_image_get_first_track_num,
.get_mcn = _cdio_image_get_mcn,
.get_num_tracks = _cdio_image_get_num_tracks,