* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if HAVE_CONFIG_H
#include "FLAC/assert.h"
#include "FLAC/metadata.h"
#include "test_libs_common/metadata_utils.h"
+#include "share/compat.h"
#include "metadata.h"
-#if HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
#include <stdio.h>
#include <stdlib.h> /* for malloc() */
#include <string.h> /* for memcmp() */
{
FLAC__byte *ret;
- if(0 == (ret = (FLAC__byte*)malloc(len))) {
+ if(0 == (ret = malloc(len))) {
printf("FAILED, malloc error\n");
exit(1);
}
static void entry_new_(FLAC__StreamMetadata_VorbisComment_Entry *entry, const char *field)
{
entry->length = strlen(field);
- entry->entry = (FLAC__byte*)malloc(entry->length+1);
+ entry->entry = malloc(entry->length+1);
FLAC__ASSERT(0 != entry->entry);
memcpy(entry->entry, field, entry->length);
entry->entry[entry->length] = '\0';
static void entry_clone_(FLAC__StreamMetadata_VorbisComment_Entry *entry)
{
- FLAC__byte *x = (FLAC__byte*)malloc(entry->length+1);
+ FLAC__byte *x = malloc(entry->length+1);
FLAC__ASSERT(0 != x);
memcpy(x, entry->entry, entry->length);
x[entry->length] = '\0';
}
}
else {
- vc->comments = (FLAC__StreamMetadata_VorbisComment_Entry*)realloc(vc->comments, sizeof(FLAC__StreamMetadata_VorbisComment_Entry)*num);
+ vc->comments = realloc(vc->comments, sizeof(FLAC__StreamMetadata_VorbisComment_Entry)*num);
FLAC__ASSERT(0 != vc->comments);
if(num > vc->num_comments)
memset(vc->comments+vc->num_comments, 0, sizeof(FLAC__StreamMetadata_VorbisComment_Entry)*(num-vc->num_comments));
static void vc_replace_new_(FLAC__StreamMetadata_VorbisComment_Entry *entry, FLAC__StreamMetadata *block, const char *field, FLAC__bool all)
{
- int index;
+ int indx;
char field_name[256];
const char *eq = strchr(field, '=');
FLAC__ASSERT(eq>field && (unsigned)(eq-field) < sizeof(field_name));
memcpy(field_name, field, eq-field);
field_name[eq-field]='\0';
- index = vc_find_from_(block, field_name, 0);
- if(index < 0)
+ indx = vc_find_from_(block, field_name, 0);
+ if(indx < 0)
vc_insert_new_(entry, block, block->data.vorbis_comment.num_comments, field);
else {
- vc_set_new_(entry, block, (unsigned)index, field);
+ vc_set_new_(entry, block, (unsigned)indx, field);
if(all) {
- for(index = index+1; index >= 0 && (unsigned)index < block->data.vorbis_comment.num_comments; )
- if((index = vc_find_from_(block, field_name, (unsigned)index)) >= 0)
- vc_delete_(block, (unsigned)index);
+ for(indx = indx+1; indx >= 0 && (unsigned)indx < block->data.vorbis_comment.num_comments; )
+ if((indx = vc_find_from_(block, field_name, (unsigned)indx)) >= 0)
+ vc_delete_(block, (unsigned)indx);
}
}
{
if(track->num_indices > 0) {
size_t bytes = sizeof(FLAC__StreamMetadata_CueSheet_Index) * track->num_indices;
- FLAC__StreamMetadata_CueSheet_Index *x = (FLAC__StreamMetadata_CueSheet_Index*)malloc(bytes);
+ FLAC__StreamMetadata_CueSheet_Index *x = malloc(bytes);
FLAC__ASSERT(0 != x);
memcpy(x, track->indices, bytes);
track->indices = x;
}
}
else {
- tr->indices = (FLAC__StreamMetadata_CueSheet_Index*)realloc(tr->indices, sizeof(FLAC__StreamMetadata_CueSheet_Index)*num);
+ tr->indices = realloc(tr->indices, sizeof(FLAC__StreamMetadata_CueSheet_Index)*num);
FLAC__ASSERT(0 != tr->indices);
if(num > tr->num_indices)
memset(tr->indices+tr->num_indices, 0, sizeof(FLAC__StreamMetadata_CueSheet_Index)*(num-tr->num_indices));
cs_calc_len_(block);
}
-static void tr_set_new_(FLAC__StreamMetadata *block, unsigned track_num, unsigned pos, FLAC__StreamMetadata_CueSheet_Index index)
+static void tr_set_new_(FLAC__StreamMetadata *block, unsigned track_num, unsigned pos, FLAC__StreamMetadata_CueSheet_Index indx)
{
FLAC__StreamMetadata_CueSheet_Track *tr;
FLAC__ASSERT(pos < tr->num_indices);
- tr->indices[pos] = index;
+ tr->indices[pos] = indx;
cs_calc_len_(block);
}
-static void tr_insert_new_(FLAC__StreamMetadata *block, unsigned track_num, unsigned pos, FLAC__StreamMetadata_CueSheet_Index index)
+static void tr_insert_new_(FLAC__StreamMetadata *block, unsigned track_num, unsigned pos, FLAC__StreamMetadata_CueSheet_Index indx)
{
FLAC__StreamMetadata_CueSheet_Track *tr;
tr_resize_(block, track_num, tr->num_indices+1);
memmove(&tr->indices[pos+1], &tr->indices[pos], sizeof(FLAC__StreamMetadata_CueSheet_Index)*(tr->num_indices-1-pos));
- tr_set_new_(block, track_num, pos, index);
+ tr_set_new_(block, track_num, pos, indx);
cs_calc_len_(block);
}
}
}
else {
- cs->tracks = (FLAC__StreamMetadata_CueSheet_Track*)realloc(cs->tracks, sizeof(FLAC__StreamMetadata_CueSheet_Track)*num);
+ cs->tracks = realloc(cs->tracks, sizeof(FLAC__StreamMetadata_CueSheet_Track)*num);
FLAC__ASSERT(0 != cs->tracks);
if(num > cs->num_tracks)
memset(cs->tracks+cs->num_tracks, 0, sizeof(FLAC__StreamMetadata_CueSheet_Track)*(num-cs->num_tracks));
FLAC__StreamMetadata *block, *blockcopy, *vorbiscomment, *cuesheet, *picture;
FLAC__StreamMetadata_SeekPoint seekpoint_array[14];
FLAC__StreamMetadata_VorbisComment_Entry entry;
- FLAC__StreamMetadata_CueSheet_Index index;
+ FLAC__StreamMetadata_CueSheet_Index indx;
FLAC__StreamMetadata_CueSheet_Track track;
unsigned i, expected_length, seekpoints;
int j;
return false;
printf("OK\n");
- index.offset = 0;
- index.number = 1;
+ indx.offset = 0;
+ indx.number = 1;
printf("testing FLAC__metadata_object_cuesheet_track_insert_index() on empty array...");
- tr_insert_new_(cuesheet, 0, 0, index);
- if(!FLAC__metadata_object_cuesheet_track_insert_index(block, 0, 0, index)) {
+ tr_insert_new_(cuesheet, 0, 0, indx);
+ if(!FLAC__metadata_object_cuesheet_track_insert_index(block, 0, 0, indx)) {
printf("FAILED, returned false\n");
return false;
}
return false;
printf("OK\n");
- index.offset = 10;
- index.number = 2;
+ indx.offset = 10;
+ indx.number = 2;
printf("testing FLAC__metadata_object_cuesheet_track_insert_index() on beginning of non-empty array...");
- tr_insert_new_(cuesheet, 0, 0, index);
- if(!FLAC__metadata_object_cuesheet_track_insert_index(block, 0, 0, index)) {
+ tr_insert_new_(cuesheet, 0, 0, indx);
+ if(!FLAC__metadata_object_cuesheet_track_insert_index(block, 0, 0, indx)) {
printf("FAILED, returned false\n");
return false;
}
return false;
printf("OK\n");
- index.offset = 20;
- index.number = 3;
+ indx.offset = 20;
+ indx.number = 3;
printf("testing FLAC__metadata_object_cuesheet_track_insert_index() on middle of non-empty array...");
- tr_insert_new_(cuesheet, 0, 1, index);
- if(!FLAC__metadata_object_cuesheet_track_insert_index(block, 0, 1, index)) {
+ tr_insert_new_(cuesheet, 0, 1, indx);
+ if(!FLAC__metadata_object_cuesheet_track_insert_index(block, 0, 1, indx)) {
printf("FAILED, returned false\n");
return false;
}
return false;
printf("OK\n");
- index.offset = 30;
- index.number = 4;
+ indx.offset = 30;
+ indx.number = 4;
printf("testing FLAC__metadata_object_cuesheet_track_insert_index() on end of non-empty array...");
- tr_insert_new_(cuesheet, 0, 3, index);
- if(!FLAC__metadata_object_cuesheet_track_insert_index(block, 0, 3, index)) {
+ tr_insert_new_(cuesheet, 0, 3, indx);
+ if(!FLAC__metadata_object_cuesheet_track_insert_index(block, 0, 3, indx)) {
printf("FAILED, returned false\n");
return false;
}
return false;
printf("OK\n");
- index.offset = 0;
- index.number = 0;
+ indx.offset = 0;
+ indx.number = 0;
printf("testing FLAC__metadata_object_cuesheet_track_insert_blank_index() on end of non-empty array...");
- tr_insert_new_(cuesheet, 0, 4, index);
+ tr_insert_new_(cuesheet, 0, 4, indx);
if(!FLAC__metadata_object_cuesheet_track_insert_blank_index(block, 0, 4)) {
printf("FAILED, returned false\n");
return false;