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

remove cdio_malloc and replace with calloc which does functionally

Browse Source 
exactly the same thing (but is standard). In some drivers _data -> p_data.
This commit is contained in:
rocky
2005-02-03 07:35:14 +00:00
parent c54e370157
commit f1d3b190ba
15 changed files with 88 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/driver/image/bincue.c
View File

@@ -1,5 +1,5 @@
/*
$Id: bincue.c,v 1.10 2005/01/30 10:05:37 rocky Exp $
$Id: bincue.c,v 1.11 2005/02/03 07:35:16 rocky Exp $
Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -26,7 +26,7 @@
(*.cue).
*/
static const char _rcsid[] = "$Id: bincue.c,v 1.10 2005/01/30 10:05:37 rocky Exp $";
static const char _rcsid[] = "$Id: bincue.c,v 1.11 2005/02/03 07:35:16 rocky Exp $";
#include "image.h"
#include "cdio_assert.h"
@@ -1128,7 +1128,7 @@ CdIo_t *
cdio_open_cue (const char *psz_cue_name)
{
CdIo_t *ret;
_img_private_t *_data;
_img_private_t *p_data;
char *psz_bin_name;
cdio_funcs_t _funcs;
@@ -1166,14 +1166,14 @@ cdio_open_cue (const char *psz_cue_name)
if (NULL == psz_cue_name) return NULL;
_data = _cdio_malloc (sizeof (_img_private_t));
_data->gen.init = false;
_data->psz_cue_name = NULL;
p_data = calloc(1, sizeof (_img_private_t));
p_data->gen.init = false;
p_data->psz_cue_name = NULL;
ret = cdio_new ((void *)_data, &_funcs);
ret = cdio_new ((void *)p_data, &_funcs);
if (ret == NULL) {
free(_data);
free(p_data);
return NULL;
}
@@ -1185,15 +1185,15 @@ cdio_open_cue (const char *psz_cue_name)
psz_cue_name);
}
_set_arg_image (_data, "cue", psz_cue_name);
_set_arg_image (_data, "source", psz_bin_name);
_set_arg_image (_data, "access-mode", "bincue");
_set_arg_image (p_data, "cue", psz_cue_name);
_set_arg_image (p_data, "source", psz_bin_name);
_set_arg_image (p_data, "access-mode", "bincue");
free(psz_bin_name);
if (_init_bincue(_data)) {
if (_init_bincue(p_data)) {
return ret;
} else {
_free_image(_data);
_free_image(p_data);
free(ret);
return NULL;
}

38
lib/driver/image/cdrdao.c
View File

@@ -1,5 +1,5 @@
/*
$Id: cdrdao.c,v 1.11 2005/01/24 00:06:31 rocky Exp $
$Id: cdrdao.c,v 1.12 2005/02/03 07:35:16 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
toc reading routine adapted from cuetools
@@ -25,7 +25,7 @@
(*.cue).
*/
static const char _rcsid[] = "$Id: cdrdao.c,v 1.11 2005/01/24 00:06:31 rocky Exp $";
static const char _rcsid[] = "$Id: cdrdao.c,v 1.12 2005/02/03 07:35:16 rocky Exp $";
#include "image.h"
#include "cdio_assert.h"
@@ -1142,7 +1142,7 @@ cdio_get_default_device_cdrdao(void)
}
static bool
get_hwinfo_cdrdao ( const CdIo *p_cdio, /*out*/ cdio_hwinfo_t *hw_info)
get_hwinfo_cdrdao ( const CdIo_t *p_cdio, /*out*/ cdio_hwinfo_t *hw_info)
{
strcpy(hw_info->psz_vendor, "libcdio");
strcpy(hw_info->psz_model, "cdrdao");
@@ -1238,7 +1238,7 @@ cdio_is_tocfile(const char *psz_cue_name)
get called via a function pointer. In fact *we* are the
ones to set that up.
*/
CdIo *
CdIo_t *
cdio_open_am_cdrdao (const char *psz_source_name, const char *psz_access_mode)
{
if (psz_access_mode != NULL && strcmp(psz_access_mode, "image"))
@@ -1252,11 +1252,11 @@ cdio_open_am_cdrdao (const char *psz_source_name, const char *psz_access_mode)
get called via a function pointer. In fact *we* are the
ones to set that up.
*/
CdIo *
CdIo_t *
cdio_open_cdrdao (const char *psz_cue_name)
{
CdIo *ret;
_img_private_t *_data;
CdIo_t *ret;
_img_private_t *p_data;
cdio_funcs_t _funcs;
@@ -1295,16 +1295,16 @@ cdio_open_cdrdao (const char *psz_cue_name)
if (NULL == psz_cue_name) return NULL;
_data = _cdio_malloc (sizeof (_img_private_t));
_data->gen.init = false;
_data->psz_cue_name = NULL;
_data->gen.data_source = NULL;
_data->gen.source_name = NULL;
p_data = calloc(1, sizeof (_img_private_t));
p_data->gen.init = false;
p_data->psz_cue_name = NULL;
p_data->gen.data_source = NULL;
p_data->gen.source_name = NULL;
ret = cdio_new ((void *)_data, &_funcs);
ret = cdio_new ((void *)p_data, &_funcs);
if (ret == NULL) {
free(_data);
free(p_data);
return NULL;
}
@@ -1315,14 +1315,14 @@ cdio_open_cdrdao (const char *psz_cue_name)
return NULL;
}
_set_arg_image (_data, "cue", psz_cue_name);
_set_arg_image (_data, "source", psz_cue_name);
_set_arg_image (_data, "access-mode", "cdrdao");
_set_arg_image (p_data, "cue", psz_cue_name);
_set_arg_image (p_data, "source", psz_cue_name);
_set_arg_image (p_data, "access-mode", "cdrdao");
if (_init_cdrdao(_data)) {
if (_init_cdrdao(p_data)) {
return ret;
} else {
_free_image(_data);
_free_image(p_data);
free(ret);
return NULL;
}

18
lib/driver/image/nrg.c
View File

@@ -1,5 +1,5 @@
/*
$Id: nrg.c,v 1.9 2005/01/24 00:06:31 rocky Exp $
$Id: nrg.c,v 1.10 2005/02/03 07:35:16 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2001, 2003 Herbert Valerio Riedel <hvr@gnu.org>
@@ -46,7 +46,7 @@
#include "_cdio_stdio.h"
#include "nrg.h"
static const char _rcsid[] = "$Id: nrg.c,v 1.9 2005/01/24 00:06:31 rocky Exp $";
static const char _rcsid[] = "$Id: nrg.c,v 1.10 2005/02/03 07:35:16 rocky Exp $";
/* reader */
@@ -81,7 +81,7 @@ _register_mapping (_img_private_t *env, lsn_t start_lsn, uint32_t sec_count,
{
const int track_num=env->gen.i_tracks;
track_info_t *this_track=&(env->tocent[env->gen.i_tracks]);
_mapping_t *_map = _cdio_malloc (sizeof (_mapping_t));
_mapping_t *_map = calloc(1, sizeof (_mapping_t));
_map->start_lsn = start_lsn;
_map->sec_count = sec_count;
@@ -208,7 +208,7 @@ parse_nrg (_img_private_t *p_env, const char *psz_nrg_name)
cdio_assert (IN ((size - footer_start), 0, 4096));
footer_buf = _cdio_malloc (size - footer_start);
footer_buf = calloc(1, size - footer_start);
cdio_stream_seek (p_env->gen.data_source, footer_start, SEEK_SET);
cdio_stream_read (p_env->gen.data_source, footer_buf,
@@ -372,7 +372,7 @@ parse_nrg (_img_private_t *p_env, const char *psz_nrg_name)
int disc_mode;
/* We include an extra 0 byte so these can be used as C strings.*/
p_env->psz_mcn = _cdio_malloc (CDIO_MCN_SIZE+1);
p_env->psz_mcn = calloc(1, CDIO_MCN_SIZE+1);
if (DAOX_ID == opcode) {
_daox_array_t *_entries = (void *) chunk->data;
@@ -517,6 +517,7 @@ parse_nrg (_img_private_t *p_env, const char *psz_nrg_name)
track_green = false; /* ?? */
blocksize = CDIO_CD_FRAMESIZE;
p_env->disc_mode = CDIO_DISC_MODE_CD_DATA;
cdio_info ("Format DATA, blocksize %u", CDIO_CD_FRAMESIZE);
break;
case 2:
/* Mode 2 form 1 */
@@ -524,6 +525,7 @@ parse_nrg (_img_private_t *p_env, const char *psz_nrg_name)
track_green = false; /* ?? */
blocksize = CDIO_CD_FRAMESIZE;
p_env->disc_mode = CDIO_DISC_MODE_CD_XA;
cdio_info ("Format XA, blocksize %u", CDIO_CD_FRAMESIZE);
break;
case 3:
/* Mode 2 */
@@ -531,6 +533,7 @@ parse_nrg (_img_private_t *p_env, const char *psz_nrg_name)
track_green = true;
blocksize = M2RAW_SECTOR_SIZE;
p_env->disc_mode = CDIO_DISC_MODE_CD_XA; /* ?? */
cdio_info ("Format XA, blocksize %u", M2RAW_SECTOR_SIZE);
break;
case 06:
/* Mode2 form mix */
@@ -538,18 +541,21 @@ parse_nrg (_img_private_t *p_env, const char *psz_nrg_name)
track_green = true;
blocksize = M2RAW_SECTOR_SIZE;
p_env->disc_mode = CDIO_DISC_MODE_CD_MIXED;
cdio_info ("Format MIXED CD, blocksize %u", M2RAW_SECTOR_SIZE);
break;
case 0x20: /* ??? Mode2 form 2, Mode2 raw?? */
track_format = TRACK_FORMAT_XA;
track_green = true;
blocksize = M2RAW_SECTOR_SIZE;
p_env->disc_mode = CDIO_DISC_MODE_CD_XA; /* ??. */
cdio_info ("Format MIXED CD, blocksize %u", M2RAW_SECTOR_SIZE);
break;
case 7:
track_format = TRACK_FORMAT_AUDIO;
track_green = false;
blocksize = CDIO_CD_FRAMESIZE_RAW;
p_env->disc_mode = CDIO_DISC_MODE_CD_DA;
cdio_info ("Format CD_DA, blocksize %u", CDIO_CD_FRAMESIZE_RAW);
break;
default:
cdio_log (log_level,
@@ -1238,7 +1244,7 @@ cdio_open_nrg (const char *psz_source)
_funcs.read_mode2_sectors = _read_mode2_sectors_nrg;
_funcs.set_arg = _set_arg_image;
_data = _cdio_malloc (sizeof (_img_private_t));
_data = calloc(1, sizeof (_img_private_t));
_data->gen.init = false;
_data->gen.i_tracks = 0;