[fuse-emulator-cvs] SF.net SVN: fuse-emulator:[5129] trunk/libspectrum

[<zu...@us...>]

Revision: 5129
          http://sourceforge.net/p/fuse-emulator/code/5129
Author:   zubzero
Date:     2015-03-02 22:38:59 +0000 (Mon, 02 Mar 2015)
Log Message:
-----------
Rename libspectrum_calloc() to libspectrum_malloc0_n()

Modified Paths:
--------------
    trunk/libspectrum/hacking/ChangeLog
    trunk/libspectrum/libspectrum.h.in
    trunk/libspectrum/memory.c

Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog	2015-03-02 22:35:04 UTC (rev 5128)
+++ trunk/libspectrum/hacking/ChangeLog	2015-03-02 22:38:59 UTC (rev 5129)
@@ -988,3 +988,5 @@
 20150302 memory.c: check for overflow in libspectrum_calloc() (Stuart).
 20150302 libspectrum.h.in,memory.c: add libspectrum_{m,re}alloc_n() and use this
          for libspectrum_{new,renew}() macros (Stuart).
+20150302 libspectrum.h.in,memory.c: rename libspectrum_calloc() to
+         libspectrum_malloc0_n() (Stuart).

Modified: trunk/libspectrum/libspectrum.h.in
===================================================================
--- trunk/libspectrum/libspectrum.h.in	2015-03-02 22:35:04 UTC (rev 5128)
+++ trunk/libspectrum/libspectrum.h.in	2015-03-02 22:38:59 UTC (rev 5129)
@@ -144,7 +144,7 @@
 
 WIN32_DLL void* libspectrum_malloc( size_t size );
 WIN32_DLL void* libspectrum_malloc_n( size_t nmemb, size_t size );
-WIN32_DLL void* libspectrum_calloc( size_t nmemb, size_t size );
+WIN32_DLL void* libspectrum_malloc0_n( size_t nmemb, size_t size );
 WIN32_DLL void* libspectrum_realloc( void *ptr, size_t size );
 WIN32_DLL void* libspectrum_realloc_n( void *ptr, size_t nmemb, size_t size );
 WIN32_DLL void libspectrum_free( void *ptr );
@@ -155,11 +155,14 @@
   ( ( type * ) libspectrum_malloc_n( (count), sizeof( type ) ) )
 
 #define libspectrum_new0( type, count ) \
-  ( ( type * ) libspectrum_calloc( (count), sizeof( type ) ) )
+  ( ( type * ) libspectrum_malloc0_n( (count), sizeof( type ) ) )
 
 #define libspectrum_renew( type, mem, count ) \
-  ( ( type * ) libspectrum_realloc_n( (void *)mem, (count), sizeof( type ) ) )
+  ( ( type * ) libspectrum_realloc_n( (void *)mem, (count), sizeof( type ) )
 
+/* Deprecated */
+#define libspectrum_calloc libspectrum_malloc0_n
+
 /* Attempt to identify a given file */
 
 /* Various types of file we might manage to identify */

Modified: trunk/libspectrum/memory.c
===================================================================
--- trunk/libspectrum/memory.c	2015-03-02 22:35:04 UTC (rev 5128)
+++ trunk/libspectrum/memory.c	2015-03-02 22:38:59 UTC (rev 5129)
@@ -29,6 +29,12 @@
 
 #include "internals.h"
 
+/* We don't want the macro from libspectrum.h */
+#undef libspectrum_calloc
+
+/* Deprecated, removed from header in favour of macro. */
+void* libspectrum_calloc( size_t nmemb, size_t size );
+
 libspectrum_malloc_fn_t libspectrum_malloc_fn = malloc;
 libspectrum_calloc_fn_t libspectrum_calloc_fn = calloc;
 libspectrum_realloc_fn_t libspectrum_realloc_fn = realloc;
@@ -54,7 +60,7 @@
 }
 
 void*
-libspectrum_calloc( size_t nmemb, size_t size )
+libspectrum_malloc0_n( size_t nmemb, size_t size )
 {
   void *ptr;
 
@@ -69,6 +75,12 @@
 }
 
 void*
+libspectrum_calloc( size_t nmemb, size_t size )
+{
+  return libspectrum_malloc0_n( nmemb, size );
+}
+
+void*
 libspectrum_realloc( void *ptr, size_t size )
 {
   ptr = libspectrum_realloc_fn( ptr, size );

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.