lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject [lucy-commits] [4/7] git commit: refs/heads/ivars-wip1 - Fixup Lucy Store classes IVARS glitches.
Date Sun, 14 Jul 2013 00:14:50 GMT
Fixup Lucy Store classes IVARS glitches.

(Will be folded into earlier commit before merging to master.)


Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/98dbab2a
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/98dbab2a
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/98dbab2a

Branch: refs/heads/ivars-wip1
Commit: 98dbab2a0fcd66273c3e38097651ccb71c5bf999
Parents: 2966097
Author: Marvin Humphrey <marvin@rectangular.com>
Authored: Fri Jul 12 19:34:11 2013 -0700
Committer: Marvin Humphrey <marvin@rectangular.com>
Committed: Sat Jul 13 15:17:28 2013 -0700

----------------------------------------------------------------------
 core/Lucy/Store/InStream.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/98dbab2a/core/Lucy/Store/InStream.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/InStream.c b/core/Lucy/Store/InStream.c
index 467bb64..caf286e 100644
--- a/core/Lucy/Store/InStream.c
+++ b/core/Lucy/Store/InStream.c
@@ -133,7 +133,8 @@ InStream_reopen(InStream *self, const CharBuf *filename, int64_t offset,
               offset, len, FH_Length(ivars->file_handle));
     }
 
-    InStream *other = (InStream*)VTable_Make_Obj(ivars->vtable);
+    VTable *vtable = InStream_Get_VTable(self);
+    InStream *other = (InStream*)VTable_Make_Obj(vtable);
     InStreamIVARS *const ovars = InStream_IVARS(other);
     InStream_do_open(other, (Obj*)ivars->file_handle);
     if (filename != NULL) { CB_Mimic(ovars->filename, (Obj*)filename); }
@@ -147,7 +148,8 @@ InStream_reopen(InStream *self, const CharBuf *filename, int64_t offset,
 InStream*
 InStream_clone(InStream *self) {
     InStreamIVARS *const ivars = InStream_IVARS(self);
-    InStream *twin = (InStream*)VTable_Make_Obj(ivars->vtable);
+    VTable *vtable = InStream_Get_VTable(self);
+    InStream *twin = (InStream*)VTable_Make_Obj(vtable);
     InStream_do_open(twin, (Obj*)ivars->file_handle);
     InStream_Seek(twin, SI_tell(self));
     return twin;


Mime
View raw message