[gs-cvs] rev 7650 - trunk/gs/src

[lpd at ghostscript.com]

Author: lpd
Date: 2007-01-27 14:16:46 -0800 (Sat, 27 Jan 2007)
New Revision: 7650

Modified:
   trunk/gs/src/gsalloc.c
   trunk/gs/src/gsmalloc.c
   trunk/gs/src/gsmemlok.c
   trunk/gs/src/gsmemory.h
   trunk/gs/src/gsmemret.c
   trunk/gs/src/iutil.c
Log:
Changes the first argument of the object_type procedure for gs_memory_t
structures from gs_memory_t * to const gs_memory_t *, to clear up a couple
of compiler warnings.


Modified: trunk/gs/src/gsalloc.c
===================================================================
--- trunk/gs/src/gsalloc.c	2007-01-27 20:14:52 UTC (rev 7649)
+++ trunk/gs/src/gsalloc.c	2007-01-27 22:16:46 UTC (rev 7650)
@@ -438,7 +438,7 @@
 
 /* Get the type of a structure from the header. */
 private gs_memory_type_ptr_t
-i_object_type(gs_memory_t * mem, const void /*obj_header_t */ *obj)
+i_object_type(const gs_memory_t * mem, const void /*obj_header_t */ *obj)
 {
     return ((const obj_header_t *)obj - 1)->o_type;
 }

Modified: trunk/gs/src/gsmalloc.c
===================================================================
--- trunk/gs/src/gsmalloc.c	2007-01-27 20:14:52 UTC (rev 7649)
+++ trunk/gs/src/gsmalloc.c	2007-01-27 22:16:46 UTC (rev 7650)
@@ -279,7 +279,7 @@
     return ((const gs_malloc_block_t *)ptr)[-1].size;
 }
 private gs_memory_type_ptr_t
-gs_heap_object_type(gs_memory_t * mem, const void *ptr)
+gs_heap_object_type(const gs_memory_t * mem, const void *ptr)
 {
     return ((const gs_malloc_block_t *)ptr)[-1].type;
 }

Modified: trunk/gs/src/gsmemlok.c
===================================================================
--- trunk/gs/src/gsmemlok.c	2007-01-27 20:14:52 UTC (rev 7649)
+++ trunk/gs/src/gsmemlok.c	2007-01-27 22:16:46 UTC (rev 7650)
@@ -272,7 +272,7 @@
 		     );
 }
 private gs_memory_type_ptr_t
-gs_locked_object_type(gs_memory_t * mem, const void *ptr)
+gs_locked_object_type(const gs_memory_t * mem, const void *ptr)
 {
     RETURN_MONITORED(
 		     gs_memory_type_ptr_t,

Modified: trunk/gs/src/gsmemory.h
===================================================================
--- trunk/gs/src/gsmemory.h	2007-01-27 20:14:52 UTC (rev 7649)
+++ trunk/gs/src/gsmemory.h	2007-01-27 22:16:46 UTC (rev 7650)
@@ -308,7 +308,7 @@
      */
 
 #define gs_memory_proc_object_type(proc)\
-  gs_memory_type_ptr_t proc(gs_memory_t *mem, const void *obj)
+  gs_memory_type_ptr_t proc(const gs_memory_t *mem, const void *obj)
 #define gs_object_type(mem, obj)\
   (*(mem)->procs.object_type)(mem, obj)
     gs_memory_proc_object_type((*object_type));

Modified: trunk/gs/src/gsmemret.c
===================================================================
--- trunk/gs/src/gsmemret.c	2007-01-27 20:14:52 UTC (rev 7649)
+++ trunk/gs/src/gsmemret.c	2007-01-27 22:16:46 UTC (rev 7650)
@@ -262,7 +262,7 @@
     DO_FORWARD(return target->procs.object_size(target, ptr));
 }
 private gs_memory_type_ptr_t
-gs_forward_object_type(gs_memory_t * mem, const void *ptr)
+gs_forward_object_type(const gs_memory_t * mem, const void *ptr)
 {
     DO_FORWARD(return target->procs.object_type(target, ptr));
 }

Modified: trunk/gs/src/iutil.c
===================================================================
--- trunk/gs/src/iutil.c	2007-01-27 20:14:52 UTC (rev 7649)
+++ trunk/gs/src/iutil.c	2007-01-27 22:16:46 UTC (rev 7650)
@@ -459,7 +459,7 @@
 	    }
 	    data = (const byte *)
 		gs_struct_type_name_string(
-		     gs_object_type((gs_memory_t *)mem,
+				gs_object_type(mem,
 				    (const obj_header_t *)op->value.pstruct));
 	    size = strlen((const char *)data);
 	    if (size > 4 && !memcmp(data + size - 4, "type", 4))