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

Small stylistic changes. More will go on in main branch

Browse Source
This commit is contained in:
R. Bernstein
2012-03-10 13:46:22 -05:00
parent ac5e935d41
commit 0c7c1104fd
4 changed files with 57 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/cdio/track.h
View File

@@ -1,6 +1,4 @@
/* /*
$Id: track.h,v 1.14 2008/03/25 15:59:09 karl Exp $
Copyright (C) 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org> Copyright (C) 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify

9
lib/driver/cdtext.c
View File

@@ -39,6 +39,10 @@
#define MAX_CDTEXT_GENRE_CODE 28 #define MAX_CDTEXT_GENRE_CODE 28
#define MAX_CDTEXT_LANGUAGE_CODE 127 #define MAX_CDTEXT_LANGUAGE_CODE 127
#ifndef CDIO_CD_MAX_TRACKS
# define CDIO_CD_MAX_TRACKS 99 /* Largest CD track number */
#endif
const char *cdtext_field[MAX_CDTEXT_FIELDS] = const char *cdtext_field[MAX_CDTEXT_FIELDS] =
{ {
"TITLE", "TITLE",
@@ -286,7 +290,7 @@ cdtext_get_const (const cdtext_t *p_cdtext, cdtext_field_t field, track_t track)
if (CDTEXT_FIELD_INVALID == field if (CDTEXT_FIELD_INVALID == field
|| NULL == p_cdtext || NULL == p_cdtext
|| 0 > track || 0 > track
|| 99 < track) || CDIO_CD_MAX_TRACKS < track)
return NULL; return NULL;
return p_cdtext->block[p_cdtext->block_i].track[track].field[field]; return p_cdtext->block[p_cdtext->block_i].track[track].field[field];
@@ -455,7 +459,8 @@ void
cdtext_set(cdtext_t *p_cdtext, cdtext_field_t key, const uint8_t *value, cdtext_set(cdtext_t *p_cdtext, cdtext_field_t key, const uint8_t *value,
track_t track, const char *charset) track_t track, const char *charset)
{ {
if (NULL == value || key == CDTEXT_FIELD_INVALID || 0 > track || 99 < track) if (NULL == value || key == CDTEXT_FIELD_INVALID || 0 > track
|| CDIO_CD_MAX_TRACKS < track)
return; return;
/* free old memory */ /* free old memory */

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

@@ -342,18 +342,20 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
const char *psz_filename = cdio_abspath (dirname, psz_field); const char *psz_filename = cdio_abspath (dirname, psz_field);
if(NULL == (source = cdio_stdio_new(psz_filename))) { if(NULL == (source = cdio_stdio_new(psz_filename))) {
cdio_log (log_level, "%s line %d: can't open file `%s' for reading", psz_cue_name, i_line, psz_field); cdio_log(log_level, "%s line %d: can't open file `%s' for reading",
psz_cue_name, i_line, psz_field);
goto err_exit; goto err_exit;
} }
size = cdio_stream_read(source, cdt_data, CDTEXT_LEN_BINARY_MAX, 1); size = cdio_stream_read(source, cdt_data, CDTEXT_LEN_BINARY_MAX, 1);
if (size < 5) { if (size < 5) {
cdio_log (log_level, "%s line %d: file `%s' is too small to contain CD-TEXT", cdio_log(log_level,
"%s line %d: file `%s' is too small to contain CD-TEXT",
psz_cue_name, i_line, (char *) psz_filename); psz_cue_name, i_line, (char *) psz_filename);
goto err_exit; goto err_exit;
} }
/* cut header */ /* Truncate header when it is too large. */
if (cdt_data[0] > 0x80) { if (cdt_data[0] > 0x80) {
ptr = &cdt_data[4]; ptr = &cdt_data[4];
size -= 4; size -= 4;

2
lib/driver/logging.c
View File

@@ -30,8 +30,6 @@
#include "cdio_assert.h" #include "cdio_assert.h"
#include "portable.h" #include "portable.h"
static const char _rcsid[] = "$Id: logging.c,v 1.2 2008/04/22 15:29:12 karl Exp $";
cdio_log_level_t cdio_loglevel_default = CDIO_LOG_WARN; cdio_log_level_t cdio_loglevel_default = CDIO_LOG_WARN;
static void static void