Clean up stack tests

[bpt/guile.git] / libguile / mallocs.c

diff --git a/libguile/mallocs.c b/libguile/mallocs.c
dissimilarity index 89%
index e4184d5..b4499bc 100644 (file)
--- a/libguile/mallocs.c
+++ b/libguile/mallocs.c
@@ -1,117 +1,77 @@
-/* classes: src_files */
-
-/*     Copyright (C) 1995 Free Software Foundation, Inc.
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-\f
-
-#include <stdio.h>
-#include "_scm.h"
-#include "genio.h"
-#include "smob.h"
-
-#include "mallocs.h"
-
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-
-\f
-
-
-#ifdef __STDC__
-static scm_sizet
-fmalloc(SCM ptr)
-#else
-static scm_sizet
-fmalloc(ptr)
-     SCM ptr;
-#endif
-{
-  if (SCM_MALLOCDATA (ptr))
-    free (SCM_MALLOCDATA (ptr));
-  return 0;
-}
-
-#ifdef __STDC__
-static int
-prinmalloc (SCM exp, SCM port, int writing)
-#else
-static int
-prinmalloc (exp, port, writing)
-     SCM exp;
-     SCM port;
-     int writing;
-#endif
-{
-  scm_gen_puts(scm_regular_string, "#<malloc ", port);
-  scm_intprint(SCM_CDR(exp), 16, port);
-  scm_gen_putc('>', port);
-  return 1;
-}
-
-\f
-int scm_tc16_malloc;
-static scm_smobfuns mallocsmob = {scm_mark0, fmalloc, prinmalloc, 0};
-
-\f
-
-#ifdef __STDC__
-SCM
-scm_malloc_obj (scm_sizet n)
-#else
-SCM
-scm_malloc_obj (n)
-     scm_sizet n;
-#endif
-{
-  SCM answer;
-  SCM mem;
-
-  SCM_NEWCELL (answer);
-  SCM_DEFER_INTS;
-  mem = (n
-        ? (SCM)malloc (n)
-        : 0);
-  if (n && !mem)
-    {
-      SCM_ALLOW_INTS;
-      return SCM_BOOL_F;
-    }
-  SCM_CDR (answer) = mem;
-  SCM_CAR (answer) = scm_tc16_malloc;
-  SCM_ALLOW_INTS;
-  return answer;
-}
-
-
-\f
-#ifdef __STDC__
-void 
-scm_init_mallocs (void)
-#else
-void 
-scm_init_mallocs ()
-#endif
-{
-  scm_tc16_malloc = scm_newsmob (&mallocsmob);
-}
-
+/* classes: src_files 
+ * Copyright (C) 1995,1997,1998,2000,2001, 2006, 2011 Free Software Foundation, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+
+
+\f
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <stdlib.h>
+
+#include "libguile/_scm.h"
+#include "libguile/ports.h"
+#include "libguile/smob.h"
+
+#include "libguile/mallocs.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+
+\f
+scm_t_bits scm_tc16_malloc;
+
+
+
+static int
+malloc_print (SCM exp, SCM port, scm_print_state *pstate SCM_UNUSED)
+{
+  scm_puts_unlocked("#<malloc ", port);
+  scm_uintprint (SCM_SMOB_DATA (exp), 16, port);
+  scm_putc_unlocked('>', port);
+  return 1;
+}
+
+\f
+SCM
+scm_malloc_obj (size_t n)
+{
+  scm_t_bits mem = n ? (scm_t_bits) scm_gc_malloc (n, "malloc smob") : 0;
+  if (n && !mem)
+    return SCM_BOOL_F;
+  SCM_RETURN_NEWSMOB (scm_tc16_malloc, mem);
+}
+
+
+\f
+void
+scm_init_mallocs ()
+{
+  scm_tc16_malloc = scm_make_smob_type ("malloc", 0);
+  scm_set_smob_print (scm_tc16_malloc, malloc_print);
+}
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/