[svn:parrot] r41753 - trunk/src/io

darbelo at svn.parrot.org darbelo at svn.parrot.org
Wed Oct 7 19:59:27 UTC 2009


Author: darbelo
Date: Wed Oct  7 19:59:25 2009
New Revision: 41753
URL: https://trac.parrot.org/parrot/changeset/41753

Log:
Change string-internals poking via ->strstart to poking via Buffer_bufstart().

Modified:
   trunk/src/io/buffer.c
   trunk/src/io/portable.c
   trunk/src/io/unix.c
   trunk/src/io/win32.c

Modified: trunk/src/io/buffer.c
==============================================================================
--- trunk/src/io/buffer.c	Wed Oct  7 18:25:01 2009	(r41752)
+++ trunk/src/io/buffer.c	Wed Oct  7 19:59:25 2009	(r41753)
@@ -233,10 +233,9 @@
     STRING  *s    = &fake;
     PIOOFF_T pos  = Parrot_io_get_file_position(interp, filehandle);
 
-    fake.strstart = (char *)Parrot_io_get_buffer_start(interp, filehandle);
-    fake.bufused  = Parrot_io_get_buffer_size(interp, filehandle);
-
-    got           = PIO_READ(interp, filehandle, &s);
+    Buffer_bufstart(s) = Parrot_io_get_buffer_start(interp, filehandle);
+    fake.bufused       = Parrot_io_get_buffer_size(interp, filehandle);
+    got                = PIO_READ(interp, filehandle, &s);
 
     /* buffer-filling does not change fileposition */
     Parrot_io_set_file_position(interp, filehandle, pos);
@@ -347,10 +346,10 @@
             STRING     fake;
             STRING    *sf = &fake;
 
-            fake.strstart = (char *)out_buf;
-            fake.bufused  = len;
-            got           = PIO_READ(interp, filehandle, &sf);
-            s->strlen     = s->bufused = current + got;
+            Buffer_bufstart(sf) = (char *)out_buf;
+            fake.bufused        = len;
+            got                 = PIO_READ(interp, filehandle, &sf);
+            s->strlen           = s->bufused = current + got;
 
             Parrot_io_set_file_position(interp, filehandle,
                     (got + Parrot_io_get_file_position(interp, filehandle)));

Modified: trunk/src/io/portable.c
==============================================================================
--- trunk/src/io/portable.c	Wed Oct  7 18:25:01 2009	(r41752)
+++ trunk/src/io/portable.c	Wed Oct  7 19:59:25 2009	(r41753)
@@ -375,7 +375,7 @@
     ASSERT_ARGS(Parrot_io_read_portable)
     FILE   * const fptr   = (FILE *)Parrot_io_get_os_handle(interp, filehandle);
     STRING * const s      = Parrot_io_make_string(interp, buf, 2048);
-    void   * const buffer = s->strstart;
+    void   * const buffer = Buffer_bufstart(s);
     const   size_t len    = s->bufused;
     const   size_t bytes  = fread(buffer, 1, len, fptr);
 

Modified: trunk/src/io/unix.c
==============================================================================
--- trunk/src/io/unix.c	Wed Oct  7 18:25:01 2009	(r41752)
+++ trunk/src/io/unix.c	Wed Oct  7 19:59:25 2009	(r41753)
@@ -502,7 +502,7 @@
     STRING * const s = Parrot_io_make_string(interp, buf, 2048);
 
     const size_t len = s->bufused;
-    void * const buffer = s->strstart;
+    void * const buffer = Buffer_bufstart(s);
 
     for (;;) {
         const int bytes = read(file_descriptor, buffer, len);

Modified: trunk/src/io/win32.c
==============================================================================
--- trunk/src/io/win32.c	Wed Oct  7 18:25:01 2009	(r41752)
+++ trunk/src/io/win32.c	Wed Oct  7 19:59:25 2009	(r41753)
@@ -439,7 +439,7 @@
 
     s = Parrot_io_make_string(interp, buf, 2048);
     len = s->bufused;
-    buffer = s->strstart;
+    buffer = Buffer_bufstart(s);
 
     if (ReadFile(Parrot_io_get_os_handle(interp, filehandle),
                 (LPVOID) buffer, (DWORD) len, &countread, NULL)) {


More information about the parrot-commits mailing list