diff modules/postgresql/postgresql.c @ 3024:b7f26b2f78bd

[xemacs-hg @ 2005-10-25 08:32:40 by ben] more mc-alloc-related factoring; make it hard to do the wrong thing postgresql/postgresql.c, postgresql/postgresql.h: MC-Alloc refactoring. ldap/eldap.c, ldap/eldap.h: MC-Alloc refactoring. alloc.c, buffer.c, console.c, emacs.c, file-coding.c, lrecord.h, lstream.c, mule-charset.c, print.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, symbols.c, symeval.h, unicode.c, window.c, xemacs.def.in.in: rename `struct lcrecord_header' to `struct old_lcrecord_header'; likewise for `old_basic_alloc_lcrecord', `old_free_lcrecord', `old_zero_lcrecord', `old_zero_sized_lcrecord', `old_copy_lcrecord', `old_copy_sized_lcrecord', `old_alloc_lcrecord_type'. Created new LISPOBJ_STORAGE_SIZE() used only on objects created through allocation of Lisp-Object memory instead of basic xmalloc()/xfree(). This is distinguished from malloced_storage_size(), for non-Lisp-Objects. The definition of LISPOBJ_STORAGE_SIZE() can reduce down to malloced_storage_size() when not MC-ALLOC, but with MC-ALLOC it's a different function. The whole point other than cleaning up the use of LISPOBJ_STORAGE_SIZE is to make it harder to accidentally use the old kind (lowercase) of function in new code, since you get a compile error.
author ben
date Tue, 25 Oct 2005 08:32:50 +0000
parents 6fa9919a9a0b
children 6ef4efc5cfe0 3742ea8250b5
line wrap: on
line diff
--- a/modules/postgresql/postgresql.c	Tue Oct 25 07:30:42 2005 +0000
+++ b/modules/postgresql/postgresql.c	Tue Oct 25 08:32:50 2005 +0000
@@ -238,21 +238,11 @@
 allocate_pgconn (void)
 {
 #ifdef RUNNING_XEMACS_21_1
-#ifdef MC_ALLOC
-  Lisp_PGconn *pgconn = alloc_lrecord_type (Lisp_PGconn,
-					    lrecord_pgconn);
-#else /* not MC_ALLOC */
-  Lisp_PGconn *pgconn = alloc_lcrecord_type (Lisp_PGconn,
+  Lisp_PGconn *pgconn = ALLOC_LCRECORD_TYPE (Lisp_PGconn,
 					     lrecord_pgconn);
-#endif /* not MC_ALLOC */
 #else
-#ifdef MC_ALLOC
-  Lisp_PGconn *pgconn = alloc_lrecord_type (Lisp_PGconn,
-					    &lrecord_pgconn);
-#else /* not MC_ALLOC */
-  Lisp_PGconn *pgconn = alloc_lcrecord_type (Lisp_PGconn,
+  Lisp_PGconn *pgconn = ALLOC_LCRECORD_TYPE (Lisp_PGconn,
 					     &lrecord_pgconn);
-#endif /* not MC_ALLOC */
 #endif
   pgconn->pgconn = (PGconn *)NULL;
   return pgconn;
@@ -373,21 +363,11 @@
 allocate_pgresult (void)
 {
 #ifdef RUNNING_XEMACS_21_1
-#ifdef MC_ALLOC
-  Lisp_PGresult *pgresult = alloc_lrecord_type (Lisp_PGresult,
-						lrecord_pgresult);
-#else /* not MC_ALLOC */
-  Lisp_PGresult *pgresult = alloc_lcrecord_type (Lisp_PGresult,
+  Lisp_PGresult *pgresult = ALLOC_LCRECORD_TYPE (Lisp_PGresult,
 						 lrecord_pgresult);
-#endif /* not MC_ALLOC */
 #else
-#ifdef MC_ALLOC
-  Lisp_PGresult *pgresult = alloc_lrecord_type (Lisp_PGresult,
-						&lrecord_pgresult);
-#else /* not MC_ALLOC */
-  Lisp_PGresult *pgresult = alloc_lcrecord_type (Lisp_PGresult,
+  Lisp_PGresult *pgresult = ALLOC_LCRECORD_TYPE (Lisp_PGresult,
 						 &lrecord_pgresult);
-#endif /* not MC_ALLOC */
 #endif
   pgresult->pgresult = (PGresult *)NULL;
   return pgresult;