Retire inclusion guard macro SCM_MAGIC_SNARFER.

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

diff --git a/libguile/rdelim.c b/libguile/rdelim.c
index c029b3f..b0e34e4 100644 (file)
--- a/libguile/rdelim.c
+++ b/libguile/rdelim.c
@@ -1,4 +1,4 @@
-/*     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001 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
@@ -124,7 +124,7 @@ SCM_DEFINE (scm_read_delimited_x, "%read-delimited!", 3, 3, 0,
 static unsigned char *
 scm_do_read_line (SCM port, size_t *len_p)
 {
-  scm_port_t *pt = SCM_PTAB_ENTRY (port);
+  scm_t_port *pt = SCM_PTAB_ENTRY (port);
   unsigned char *end;
 
   /* I thought reading lines was simple.  Mercy me.  */
@@ -136,7 +136,7 @@ scm_do_read_line (SCM port, size_t *len_p)
     {
       size_t buf_len = (end + 1) - pt->read_pos;
       /* Allocate a buffer of the perfect size.  */
-      unsigned char *buf = scm_must_malloc (buf_len + 1, "%read-line");
+      unsigned char *buf = scm_malloc (buf_len + 1);
 
       memcpy (buf, pt->read_pos, buf_len);
       pt->read_pos += buf_len;
@@ -155,7 +155,7 @@ scm_do_read_line (SCM port, size_t *len_p)
     size_t buf_size = (len < 50) ? 60 : len * 2;
     /* Invariant: buf always has buf_size + 1 characters allocated;
        the `+ 1' is for the final '\0'.  */
-    unsigned char *buf = scm_must_malloc (buf_size + 1, "%read-line");
+    unsigned char *buf = scm_malloc (buf_size + 1);
     size_t buf_len = 0;
 
     for (;;)
@@ -163,8 +163,7 @@ scm_do_read_line (SCM port, size_t *len_p)
        if (buf_len + len > buf_size)
          {
            size_t new_size = (buf_len + len) * 2;
-           buf = scm_must_realloc (buf, buf_size + 1, new_size + 1,
-                                   "%read-line");
+           buf = scm_realloc (buf, new_size + 1);
            buf_size = new_size;
          }
 
@@ -197,12 +196,12 @@ scm_do_read_line (SCM port, size_t *len_p)
       }
 
     /* I wonder how expensive this realloc is.  */
-    buf = scm_must_realloc (buf, buf_size + 1, buf_len + 1, "%read-line");
+    buf = scm_realloc (buf, buf_len + 1);
     buf[buf_len] = '\0';
     *len_p = buf_len;
     return buf;
   }
-}  
+}
 
 
 /*
@@ -223,7 +222,7 @@ SCM_DEFINE (scm_read_line, "%read-line", 0, 1, 0,
            "@code{(#<eof> . #<eof>)}.")
 #define FUNC_NAME s_scm_read_line
 {
-  scm_port_t *pt;
+  scm_t_port *pt;
   char *s;
   size_t slen;
   SCM line, term;
@@ -247,7 +246,6 @@ SCM_DEFINE (scm_read_line, "%read-line", 0, 1, 0,
          term = SCM_MAKE_CHAR ('\n');
          s[slen-1] = '\0';
          line = scm_take_str (s, slen-1);
-         scm_done_free (1);
          SCM_INCLINE (port);
        }
       else
@@ -256,7 +254,7 @@ SCM_DEFINE (scm_read_line, "%read-line", 0, 1, 0,
          term = SCM_EOF_VAL;
          line = scm_take_str (s, slen);
          SCM_COL (port) += slen;
-       }         
+       }
     }
 
   if (pt->rw_random)
@@ -285,21 +283,7 @@ SCM_DEFINE (scm_write_line, "write-line", 1, 1, 0,
 SCM
 scm_init_rdelim_builtins (void)
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/rdelim.x"
-#endif
-
-#if DEBUG_DEPRECATED == 0
-  {
-    SCM old_module = scm_current_module ();
-    const char expr[] = "\
-(define-module (guile) :use-module (ice-9 rdelim))\
-(define-module (guile-user) :use-module (ice-9 rdelim))";
-
-    scm_eval_string (scm_makfromstr (expr, (sizeof expr) - 1, 0));
-    scm_set_current_module (old_module);
-  }
-#endif
 
   return SCM_UNSPECIFIED;
 }