* Some more work to get rid of SCM_LENGTH

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

diff --git a/libguile/fports.c b/libguile/fports.c
index 8e48412..bd955e3 100644 (file)
--- a/libguile/fports.c
+++ b/libguile/fports.c
@@ -1,4 +1,4 @@
-/*     Copyright (C) 1995,1996,1997,1998,1999 Free Software Foundation, Inc.
+/*     Copyright (C) 1995,1996,1997,1998,1999, 2000 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
@@ -46,11 +46,11 @@
 
 #include <stdio.h>
 #include <fcntl.h>
-#include "_scm.h"
-#include "strings.h"
+#include "libguile/_scm.h"
+#include "libguile/strings.h"
 
-#include "validate.h"
-#include "fports.h"
+#include "libguile/validate.h"
+#include "libguile/fports.h"
 
 #ifdef HAVE_STRING_H
 #include <string.h>
@@ -66,7 +66,7 @@ scm_sizet fwrite ();
 
 #include <errno.h>
 
-#include "iselect.h"
+#include "libguile/iselect.h"
 
 /* default buffer size, used if the O/S won't supply a value.  */
 static const int default_buffer_size = 1024;
@@ -97,7 +97,7 @@ scm_fport_buffer_add (SCM port, int read_size, int write_size)
        write_size = default_size;
     }
 
-  if (SCM_INPORTP (port) && read_size > 0)
+  if (SCM_INPUT_PORT_P (port) && read_size > 0)
     {
       pt->read_buf = malloc (read_size);
       if (pt->read_buf == NULL)
@@ -111,7 +111,7 @@ scm_fport_buffer_add (SCM port, int read_size, int write_size)
       pt->read_buf_size = 1;
     }
 
-  if (SCM_OUTPORTP (port) && write_size > 0)
+  if (SCM_OUTPUT_PORT_P (port) && write_size > 0)
     {
       pt->write_buf = malloc (write_size);
       if (pt->write_buf == NULL)
@@ -143,8 +143,7 @@ SCM_DEFINE (scm_setvbuf, "setvbuf", 2, 1, 0,
            "@item _IOFBF\n"
            "block buffered, using a newly allocated buffer of @var{size} bytes.\n"
            "If @var{size} is omitted, a default size will be used.\n"
-           "@end table\n"
-           )
+           "@end table")
 #define FUNC_NAME s_scm_setvbuf
 {
   int cmode, csize;
@@ -185,9 +184,9 @@ SCM_DEFINE (scm_setvbuf, "setvbuf", 2, 1, 0,
 
   /* silently discards buffered chars.  */
   if (pt->read_buf != &pt->shortbuf)
-    scm_must_free (pt->read_buf);
+    free (pt->read_buf);
   if (pt->write_buf != &pt->shortbuf)
-    scm_must_free (pt->write_buf);
+    free (pt->write_buf);
 
   scm_fport_buffer_add (port, csize, csize);
   return SCM_UNSPECIFIED;
@@ -280,9 +279,9 @@ SCM_DEFINE (scm_open_file, "open-file", 2, 0, 0,
   SCM_VALIDATE_ROSTRING (1,filename);
   SCM_VALIDATE_ROSTRING (2,modes);
   if (SCM_SUBSTRP (filename))
-    filename = scm_makfromstr (SCM_ROCHARS (filename), SCM_ROLENGTH (filename), 0);
+    filename = scm_makfromstr (SCM_ROCHARS (filename), SCM_STRING_LENGTH (filename), 0);
   if (SCM_SUBSTRP (modes))
-    modes = scm_makfromstr (SCM_ROCHARS (modes), SCM_ROLENGTH (modes), 0);
+    modes = scm_makfromstr (SCM_ROCHARS (modes), SCM_STRING_LENGTH (modes), 0);
 
   file = SCM_ROCHARS (filename);
   mode = SCM_ROCHARS (modes);
@@ -603,7 +602,7 @@ fport_write (SCM port, const void *data, size_t size)
        }
 
       /* handle line buffering.  */
-      if ((SCM_UNPACK_CAR (port) & SCM_BUFLINE) && memchr (data, '\n', size))
+      if ((SCM_CELL_WORD_0 (port) & SCM_BUFLINE) && memchr (data, '\n', size))
        fport_flush (port);
     }
 }
@@ -617,7 +616,7 @@ fport_flush (SCM port)
 {
   scm_port *pt = SCM_PTAB_ENTRY (port);
   struct scm_fport *fp = SCM_FSTREAM (port);
-  char *ptr = pt->write_buf;
+  unsigned char *ptr = pt->write_buf;
   int init_size = pt->write_pos - pt->write_buf;
   int remaining = init_size;
 
@@ -730,7 +729,7 @@ scm_make_fptob ()
 void
 scm_init_fports ()
 {
-#include "fports.x"
+#include "libguile/fports.x"
   scm_sysintern ("_IOFBF", SCM_MAKINUM (_IOFBF));
   scm_sysintern ("_IOLBF", SCM_MAKINUM (_IOLBF));
   scm_sysintern ("_IONBF", SCM_MAKINUM (_IONBF));