Menu
▾
▴
[fuse-emulator-cvs] SF.net SVN: fuse-emulator:[5121] trunk/libspectrum
|
From: <zu...@us...> - 2015-03-02 13:11:56
|
Revision: 5121
http://sourceforge.net/p/fuse-emulator/code/5121
Author: zubzero
Date: 2015-03-02 13:11:54 +0000 (Mon, 02 Mar 2015)
Log Message:
-----------
Use libspectrum_{new,renew}() macros where sizeof(elem) > 1
Modified Paths:
--------------
trunk/libspectrum/accessor.pl
trunk/libspectrum/creator.c
trunk/libspectrum/csw.c
trunk/libspectrum/dck.c
trunk/libspectrum/hacking/ChangeLog
trunk/libspectrum/ide.c
trunk/libspectrum/microdrive.c
trunk/libspectrum/pzx_read.c
trunk/libspectrum/rzx.c
trunk/libspectrum/szx.c
trunk/libspectrum/tape.c
trunk/libspectrum/tape_block.c
trunk/libspectrum/tzx_read.c
trunk/libspectrum/tzx_write.c
Modified: trunk/libspectrum/accessor.pl
===================================================================
--- trunk/libspectrum/accessor.pl 2015-03-02 12:28:08 UTC (rev 5120)
+++ trunk/libspectrum/accessor.pl 2015-03-02 13:11:54 UTC (rev 5121)
@@ -246,7 +246,7 @@
libspectrum_snap*
libspectrum_snap_alloc_internal( void )
{
- return libspectrum_malloc( sizeof( libspectrum_snap ) );
+ return libspectrum_new( libspectrum_snap, 1 );
}
CODE
Modified: trunk/libspectrum/creator.c
===================================================================
--- trunk/libspectrum/creator.c 2015-03-02 12:28:08 UTC (rev 5120)
+++ trunk/libspectrum/creator.c 2015-03-02 13:11:54 UTC (rev 5121)
@@ -45,7 +45,7 @@
libspectrum_creator*
libspectrum_creator_alloc( void )
{
- libspectrum_creator *creator = libspectrum_malloc( sizeof( *creator ) );
+ libspectrum_creator *creator = libspectrum_new( libspectrum_creator, 1 );
creator->custom = NULL;
creator->custom_length = 0;
return creator;
Modified: trunk/libspectrum/csw.c
===================================================================
--- trunk/libspectrum/csw.c 2015-03-02 12:28:08 UTC (rev 5120)
+++ trunk/libspectrum/csw.c 2015-03-02 13:11:54 UTC (rev 5121)
@@ -53,7 +53,7 @@
}
/* Claim memory for the block */
- block = libspectrum_malloc( sizeof( *block ) );
+ block = libspectrum_new( libspectrum_tape_block, 1 );
/* Set the block type */
block->type = LIBSPECTRUM_TAPE_BLOCK_RLE_PULSE;
Modified: trunk/libspectrum/dck.c
===================================================================
--- trunk/libspectrum/dck.c 2015-03-02 12:28:08 UTC (rev 5120)
+++ trunk/libspectrum/dck.c 2015-03-02 13:11:54 UTC (rev 5121)
@@ -40,7 +40,7 @@
{
size_t i;
- *dck = libspectrum_malloc( sizeof( **dck ) );
+ *dck = libspectrum_new( libspectrum_dck_block, 1 );
(*dck)->bank = LIBSPECTRUM_DCK_BANK_DOCK;
for( i = 0; i < 8; i++ ) {
@@ -69,7 +69,7 @@
libspectrum_dck*
libspectrum_dck_alloc( void )
{
- libspectrum_dck *dck = libspectrum_malloc( sizeof( *dck ) );
+ libspectrum_dck *dck = libspectrum_new( libspectrum_dck, 1 );
size_t i;
for( i=0; i<256; i++ ) dck->dck[i] = NULL;
return dck;
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2015-03-02 12:28:08 UTC (rev 5120)
+++ trunk/libspectrum/hacking/ChangeLog 2015-03-02 13:11:54 UTC (rev 5121)
@@ -975,3 +975,6 @@
20150302 internals.h,pzx_read.c,szx.c,test/test.c,zxs.c: add and use ARRAY_SIZE
macro (Stuart).
20150302 libspectrum.h.in: add libspectrum_{new,new0,renew}() macros (Stuart).
+20150302 accessor.pl,creator.c,csw.c,dck.c,ide.c,microdrive.c,pzx_read.c,rzx.c,
+ szx.c,tape.c,tape_block.c,tzx_read.c,tzx_write.c: use libspectrum_new()
+ and libspectrum_renew() macros where sizeof(elem) > 1 (Stuart).
Modified: trunk/libspectrum/ide.c
===================================================================
--- trunk/libspectrum/ide.c 2015-03-02 12:28:08 UTC (rev 5120)
+++ trunk/libspectrum/ide.c 2015-03-02 13:11:54 UTC (rev 5121)
@@ -195,7 +195,7 @@
{
libspectrum_ide_channel *channel;
- channel = libspectrum_malloc( sizeof( *channel ) );
+ channel = libspectrum_new( libspectrum_ide_channel, 1 );
channel->databus = databus;
channel->drive[ LIBSPECTRUM_IDE_MASTER ].disk = NULL;
@@ -503,7 +503,7 @@
gint *key;
- key = libspectrum_malloc( sizeof( *key ) );
+ key = libspectrum_new( gint, 1 );
buffer = libspectrum_malloc( drv->sector_size * sizeof( *buffer ) );
*key = chn->sector_number;
Modified: trunk/libspectrum/microdrive.c
===================================================================
--- trunk/libspectrum/microdrive.c 2015-03-02 12:28:08 UTC (rev 5120)
+++ trunk/libspectrum/microdrive.c 2015-03-02 13:11:54 UTC (rev 5121)
@@ -66,7 +66,7 @@
libspectrum_microdrive*
libspectrum_microdrive_alloc( void )
{
- return libspectrum_malloc( sizeof( libspectrum_microdrive ) );
+ return libspectrum_new( libspectrum_microdrive, 1 );
}
/* Free a microdrive image */
Modified: trunk/libspectrum/pzx_read.c
===================================================================
--- trunk/libspectrum/pzx_read.c 2015-03-02 12:28:08 UTC (rev 5120)
+++ trunk/libspectrum/pzx_read.c 2015-03-02 13:11:54 UTC (rev 5121)
@@ -154,8 +154,8 @@
}
if( *buffer < block_end ) {
- ids = libspectrum_malloc( sizeof( *ids ) );
- strings = libspectrum_malloc( sizeof( *strings ) );
+ ids = libspectrum_new( int, 1 );
+ strings = libspectrum_new( char *, 1 );
count = 1;
i = 0;
@@ -191,8 +191,8 @@
}
i = count++;
- ids = libspectrum_realloc( ids, count * sizeof( *ids ) );
- strings = libspectrum_realloc( strings, count * sizeof( *strings ) );
+ ids = libspectrum_renew( int, ids, count );
+ strings = libspectrum_renew( char *, strings, count );
if( id == -1 ) {
size_t new_len = strlen( info_tag ) + strlen( string ) +
@@ -347,9 +347,9 @@
libspectrum_error error;
size_t buffer_sizes = 64;
size_t *pulse_repeats_buffer =
- libspectrum_malloc( buffer_sizes * sizeof( size_t ) );
+ libspectrum_new( size_t, buffer_sizes );
libspectrum_dword *lengths_buffer =
- libspectrum_malloc( buffer_sizes * sizeof( libspectrum_dword ) );
+ libspectrum_new( libspectrum_dword, buffer_sizes );
const libspectrum_byte *block_end = *buffer + data_length;
while( ( block_end - (*buffer) ) > (ptrdiff_t)0 ) {
@@ -365,11 +365,9 @@
if( buffer_sizes == count ) {
buffer_sizes *= 2;
pulse_repeats_buffer =
- libspectrum_realloc( pulse_repeats_buffer,
- buffer_sizes * sizeof( size_t ) );
+ libspectrum_renew( size_t, pulse_repeats_buffer, buffer_sizes );
lengths_buffer =
- libspectrum_realloc( lengths_buffer,
- buffer_sizes * sizeof( libspectrum_dword ) );
+ libspectrum_renew( libspectrum_dword, lengths_buffer, buffer_sizes );
}
}
@@ -381,11 +379,9 @@
if( buffer_sizes != count ) {
pulse_repeats_buffer =
- libspectrum_realloc( pulse_repeats_buffer,
- count * sizeof( size_t ) );
+ libspectrum_renew( size_t, pulse_repeats_buffer, count );
lengths_buffer =
- libspectrum_realloc( lengths_buffer,
- count * sizeof( libspectrum_dword ) );
+ libspectrum_renew( libspectrum_dword, lengths_buffer, count );
}
block = libspectrum_tape_block_alloc( LIBSPECTRUM_TAPE_BLOCK_PULSE_SEQUENCE );
@@ -597,7 +593,7 @@
return LIBSPECTRUM_ERROR_SIGNATURE;
}
- ctx = libspectrum_malloc( sizeof( *ctx ) );
+ ctx = libspectrum_new( pzx_context, 1 );
ctx->version = 0;
while( buffer < end ) {
Modified: trunk/libspectrum/rzx.c
===================================================================
--- trunk/libspectrum/rzx.c 2015-03-02 12:28:08 UTC (rev 5120)
+++ trunk/libspectrum/rzx.c 2015-03-02 13:11:54 UTC (rev 5121)
@@ -185,7 +185,7 @@
static void
block_alloc( rzx_block_t **block, libspectrum_rzx_block_id type )
{
- *block = libspectrum_malloc( sizeof( **block ) );
+ *block = libspectrum_new( rzx_block_t, 1 );
(*block)->type = type;
}
@@ -260,7 +260,7 @@
libspectrum_rzx*
libspectrum_rzx_alloc( void )
{
- libspectrum_rzx *rzx = libspectrum_malloc( sizeof( *rzx ) );
+ libspectrum_rzx *rzx = libspectrum_new( libspectrum_rzx, 1 );
rzx->blocks = NULL;
rzx->current_block = NULL;
rzx->current_input = NULL;
@@ -407,7 +407,8 @@
new_allocated = input->allocated >= 25 ? 2 * input->allocated : 50;
if( new_allocated < new_count ) new_allocated = new_count;
- ptr = libspectrum_realloc( input->frames, new_allocated * sizeof( *ptr ) );
+ ptr = libspectrum_renew( libspectrum_rzx_frame_t, input->frames,
+ new_allocated );
if( !ptr ) return LIBSPECTRUM_ERROR_MEMORY;
input->frames = ptr;
@@ -1009,7 +1010,7 @@
(*ptr)++;
/* Allocate memory for the frames */
- block->frames = libspectrum_malloc( block->count * sizeof( *block->frames ) );
+ block->frames = libspectrum_new( libspectrum_rzx_frame_t, block->count );
block->allocated = block->count;
/* Fetch the T-state counter and the flags */
Modified: trunk/libspectrum/szx.c
===================================================================
--- trunk/libspectrum/szx.c 2015-03-02 12:28:08 UTC (rev 5120)
+++ trunk/libspectrum/szx.c 2015-03-02 13:11:54 UTC (rev 5121)
@@ -2399,7 +2399,7 @@
break;
}
- ctx = libspectrum_malloc( sizeof( *ctx ) );
+ ctx = libspectrum_new( szx_context, 1 );
ctx->swap_af = 0;
while( buffer < end ) {
Modified: trunk/libspectrum/tape.c
===================================================================
--- trunk/libspectrum/tape.c 2015-03-02 12:28:08 UTC (rev 5120)
+++ trunk/libspectrum/tape.c 2015-03-02 13:11:54 UTC (rev 5121)
@@ -130,7 +130,7 @@
libspectrum_tape*
libspectrum_tape_alloc( void )
{
- libspectrum_tape *tape = libspectrum_malloc( sizeof( *tape ) );
+ libspectrum_tape *tape = libspectrum_new( libspectrum_tape, 1 );
tape->blocks = NULL;
tape->last_block = NULL;
libspectrum_tape_iterator_init( &(tape->state.current_block), tape );
Modified: trunk/libspectrum/tape_block.c
===================================================================
--- trunk/libspectrum/tape_block.c 2015-03-02 12:28:08 UTC (rev 5120)
+++ trunk/libspectrum/tape_block.c 2015-03-02 13:11:54 UTC (rev 5121)
@@ -63,7 +63,7 @@
libspectrum_tape_block*
libspectrum_tape_block_alloc( libspectrum_tape_type type )
{
- libspectrum_tape_block *block = libspectrum_malloc( sizeof( *block ) );
+ libspectrum_tape_block *block = libspectrum_new( libspectrum_tape_block, 1 );
libspectrum_tape_block_set_type( block, type );
return block;
}
@@ -470,13 +470,15 @@
}
- table->symbols = libspectrum_malloc( table->symbols_in_table * sizeof( *table->symbols ) );
+ table->symbols =
+ libspectrum_new( libspectrum_tape_generalised_data_symbol,
+ table->symbols_in_table );
for( i = 0, symbol = table->symbols;
i < table->symbols_in_table;
i++, symbol++ ) {
symbol->edge_type = **ptr; (*ptr)++;
- symbol->lengths = libspectrum_malloc( table->max_pulses * sizeof( *symbol->lengths ) );
+ symbol->lengths = libspectrum_new( libspectrum_word, table->max_pulses );
for( j = 0; j < table->max_pulses; j++ ) {
symbol->lengths[ j ] = (*ptr)[0] + (*ptr)[1] * 0x100;
(*ptr) += 2;
Modified: trunk/libspectrum/tzx_read.c
===================================================================
--- trunk/libspectrum/tzx_read.c 2015-03-02 12:28:08 UTC (rev 5120)
+++ trunk/libspectrum/tzx_read.c 2015-03-02 13:11:54 UTC (rev 5121)
@@ -406,7 +406,7 @@
return LIBSPECTRUM_ERROR_CORRUPT;
}
- lengths = libspectrum_malloc( count * sizeof( *lengths ) );
+ lengths = libspectrum_new( libspectrum_dword, count );
/* Copy the data across */
for( i = 0; i < count; i++ ) {
@@ -572,7 +572,7 @@
}
symbols = libspectrum_malloc( symbol_count * sizeof( *symbols ) );
- repeats = libspectrum_malloc( symbol_count * sizeof( *repeats ) );
+ repeats = libspectrum_new( libspectrum_word, symbol_count );
for( i = 0; i < symbol_count; i++ ) {
symbols[ i ] = **ptr; (*ptr)++;
@@ -772,10 +772,10 @@
libspectrum_tape_block_set_count( block, count );
/* Allocate memory */
- offsets = libspectrum_malloc( count * sizeof( *offsets ) );
+ offsets = libspectrum_new( int, count );
libspectrum_tape_block_set_offsets( block, offsets );
- descriptions = libspectrum_malloc( count * sizeof( *descriptions ) );
+ descriptions = libspectrum_new( char *, count );
libspectrum_tape_block_set_texts( block, descriptions );
/* Read in the data */
@@ -945,10 +945,10 @@
libspectrum_tape_block_set_count( block, count );
/* Allocate memory */
- ids = libspectrum_malloc( count * sizeof( *ids ) );
+ ids = libspectrum_new( int, count );
libspectrum_tape_block_set_ids( block, ids );
- strings = libspectrum_malloc( count * sizeof( *strings ) );
+ strings = libspectrum_new( char *, count );
libspectrum_tape_block_set_texts( block, strings );
for( i = 0; i < count; i++ ) {
@@ -1014,13 +1014,13 @@
}
/* Allocate memory */
- types = libspectrum_malloc( count * sizeof( *types ) );
+ types = libspectrum_new( int, count );
libspectrum_tape_block_set_types( block, types );
- ids = libspectrum_malloc( count * sizeof( *ids ) );
+ ids = libspectrum_new( int, count );
libspectrum_tape_block_set_ids( block, ids );
- values = libspectrum_malloc( count * sizeof( *values ) );
+ values = libspectrum_new( int, count );
libspectrum_tape_block_set_values( block, values );
/* Actually read in all the data */
Modified: trunk/libspectrum/tzx_write.c
===================================================================
--- trunk/libspectrum/tzx_write.c 2015-03-02 12:28:08 UTC (rev 5120)
+++ trunk/libspectrum/tzx_write.c 2015-03-02 13:11:54 UTC (rev 5121)
@@ -947,7 +947,7 @@
if( uncommitted_pulse_count == max_pulse_count ) {
max_pulse_count = uncommitted_pulse_count + 64;
lengths =
- libspectrum_realloc( lengths, max_pulse_count * sizeof( *lengths ) );
+ libspectrum_renew( libspectrum_dword, lengths, max_pulse_count );
}
/* Queue up pulse */
lengths[uncommitted_pulse_count++] =
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
