Enlightenment CVS committal
Author : mej
Project : eterm
Module : libast
Dir : eterm/libast/include
Modified Files:
libast.h libast_internal.h
Log Message:
Wed Jul 21 18:16:43 2004 Michael Jennings (mej)
Mmmm, beefy.
----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/include/libast.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- libast.h 20 Jul 2004 22:32:07 -0000 1.53
+++ libast.h 21 Jul 2004 22:17:49 -0000 1.54
@@ -30,8 +30,8 @@
* including all required system headers and LibAST Object headers.
*
* @author Michael Jennings <[EMAIL PROTECTED]>
- * @version $Revision: 1.53 $
- * @date $Date: 2004/07/20 22:32:07 $
+ * @version $Revision: 1.54 $
+ * @date $Date: 2004/07/21 22:17:49 $
*/
#ifndef _LIBAST_H_
@@ -1095,17 +1095,17 @@
* @ingroup DOXGRP_MEM
*/
#if (DEBUG >= DEBUG_MEM)
-# define MALLOC(sz) spifmem_malloc(__FILE__, __LINE__,
(sz))
-# define CALLOC(type,n) spifmem_calloc(__FILE__, __LINE__,
(n), (sizeof(type)))
-# define REALLOC(mem,sz) spifmem_realloc(#mem, __FILE__,
__LINE__, (mem), (sz))
-# define FREE(ptr) do { spifmem_free(#ptr, __FILE__,
__LINE__, (ptr)); (ptr) = NULL; } while (0)
-# define STRDUP(s) spifmem_strdup(#s, __FILE__,
__LINE__, (char *) (s))
+# define MALLOC(sz) spifmem_malloc(SPIF_CAST(charptr)
__FILE__, __LINE__, (sz))
+# define CALLOC(type,n) spifmem_calloc(SPIF_CAST(charptr)
__FILE__, __LINE__, (n), (sizeof(type)))
+# define REALLOC(mem,sz) spifmem_realloc(SPIF_CAST(charptr)
#mem, SPIF_CAST(charptr) __FILE__, __LINE__, (mem), (sz))
+# define FREE(ptr) do { spifmem_free(SPIF_CAST(charptr)
#ptr, SPIF_CAST(charptr) __FILE__, __LINE__, (ptr)); (ptr) = NULL; } while (0)
+# define STRDUP(s) spifmem_strdup(SPIF_CAST(charptr) #s,
SPIF_CAST(charptr) __FILE__, __LINE__, SPIF_CAST(charptr) (s))
# define MALLOC_DUMP() spifmem_dump_mem_tables()
-# define X_CREATE_PIXMAP(d, win, w, h, depth) spifmem_x_create_pixmap(__FILE__,
__LINE__, (d), (win), (w), (h), (depth))
-# define X_FREE_PIXMAP(d, p) spifmem_x_free_pixmap(#p, __FILE__,
__LINE__, (d), (p))
+# define X_CREATE_PIXMAP(d, win, w, h, depth)
spifmem_x_create_pixmap(SPIF_CAST(charptr) __FILE__, __LINE__, (d), (win), (w), (h),
(depth))
+# define X_FREE_PIXMAP(d, p)
spifmem_x_free_pixmap(SPIF_CAST(charptr) #p, SPIF_CAST(charptr) __FILE__, __LINE__,
(d), (p))
# if LIBAST_IMLIB2_SUPPORT
-# define IMLIB_REGISTER_PIXMAP(p) spifmem_imlib_register_pixmap(#p,
__FILE__, __LINE__, (p))
-# define IMLIB_FREE_PIXMAP(p) spifmem_imlib_free_pixmap(#p,
__FILE__, __LINE__, (p))
+# define IMLIB_REGISTER_PIXMAP(p)
spifmem_imlib_register_pixmap(SPIF_CAST(charptr) #p, SPIF_CAST(charptr) __FILE__,
__LINE__, (p))
+# define IMLIB_FREE_PIXMAP(p)
spifmem_imlib_free_pixmap(SPIF_CAST(charptr) #p, SPIF_CAST(charptr) __FILE__,
__LINE__, (p))
# else
# define IMLIB_REGISTER_PIXMAP(p) NOP
# define IMLIB_FREE_PIXMAP(p) NOP
@@ -2671,22 +2671,28 @@
/* mem.c */
extern void spifmem_init(void);
-extern void *spifmem_malloc(const char *, unsigned long, size_t);
-extern void *spifmem_realloc(const char *, const char *, unsigned long, void *,
size_t);
-extern void *spifmem_calloc(const char *, unsigned long, size_t, size_t);
-extern void spifmem_free(const char *, const char *, unsigned long, void *);
-extern char *spifmem_strdup(const char *, const char *, unsigned long, const char *);
+extern void *spifmem_malloc(const spif_charptr_t, unsigned long, size_t);
+extern void *spifmem_realloc(const spif_charptr_t, const spif_charptr_t, unsigned
long, void *, size_t);
+extern void *spifmem_calloc(const spif_charptr_t, unsigned long, size_t, size_t);
+extern void spifmem_free(const spif_charptr_t, const spif_charptr_t, unsigned long,
void *);
+extern spif_charptr_t spifmem_strdup(const spif_charptr_t, const spif_charptr_t,
+ unsigned long, const spif_charptr_t);
extern void spifmem_dump_mem_tables(void);
#if LIBAST_X11_SUPPORT
-extern Pixmap spifmem_x_create_pixmap(const char *, unsigned long, Display *,
Drawable, unsigned int, unsigned int, unsigned int);
-extern void spifmem_x_free_pixmap(const char *, const char *, unsigned long, Display
*, Pixmap);
+extern Pixmap spifmem_x_create_pixmap(const spif_charptr_t, unsigned long, Display *,
+ Drawable, unsigned int, unsigned int, unsigned
int);
+extern void spifmem_x_free_pixmap(const spif_charptr_t, const spif_charptr_t,
+ unsigned long, Display *, Pixmap);
# if LIBAST_IMLIB2_SUPPORT
-extern void spifmem_imlib_register_pixmap(const char *var, const char *filename,
unsigned long line, Pixmap p);
-extern void spifmem_imlib_free_pixmap(const char *var, const char *filename, unsigned
long line, Pixmap p);
+extern void spifmem_imlib_register_pixmap(const spif_charptr_t var, const
spif_charptr_t filename,
+ unsigned long line, Pixmap p);
+extern void spifmem_imlib_free_pixmap(const spif_charptr_t var, const spif_charptr_t
filename,
+ unsigned long line, Pixmap p);
# endif
extern void spifmem_dump_pixmap_tables(void);
-extern GC spifmem_x_create_gc(const char *, unsigned long, Display *, Drawable,
unsigned long, XGCValues *);
-extern void spifmem_x_free_gc(const char *, const char *, unsigned long, Display *,
GC);
+extern GC spifmem_x_create_gc(const spif_charptr_t, unsigned long, Display *,
Drawable,
+ unsigned long, XGCValues *);
+extern void spifmem_x_free_gc(const spif_charptr_t, const spif_charptr_t, unsigned
long, Display *, GC);
extern void spifmem_dump_gc_tables(void);
#endif
extern void spiftool_free_array(void *, size_t);
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/include/libast_internal.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- libast_internal.h 20 Jul 2004 22:32:07 -0000 1.20
+++ libast_internal.h 21 Jul 2004 22:17:49 -0000 1.21
@@ -29,8 +29,8 @@
* are restricted to internal LibAST use only.
*
* @author Michael Jennings <[EMAIL PROTECTED]>
- * @version $Revision: 1.20 $
- * @date $Date: 2004/07/20 22:32:07 $
+ * @version $Revision: 1.21 $
+ * @date $Date: 2004/07/21 22:17:49 $
*/
#ifndef _LIBAST_INTERNAL_H_
@@ -91,9 +91,9 @@
/** The pointer's size, in bytes. The pointer's size, in bytes. */
size_t size;
/** Filename. The file which last (re)allocated the pointer. */
- char file[LIBAST_FNAME_LEN + 1];
+ spif_char_t file[LIBAST_FNAME_LEN + 1];
/** Line number. The line number where the pointer was last (re)allocated. */
- unsigned long line;
+ spif_uint32_t line;
} ptr_t;
/**
* Pointer list structure.
@@ -107,7 +107,7 @@
*/
typedef struct memrec_t_struct {
/** Pointer count. The number of pointers being tracked. */
- unsigned long cnt;
+ size_t cnt;
/** Pointer list. The list of tracked pointers. */
ptr_t *ptrs;
} memrec_t;
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
