Skip to content

Commit 7a4af44

Browse files
Merge #2: fixed 'BytesBuffer has no length' for haxe 3.0.1
2 parents 36fdbe1 + 68e2db3 commit 7a4af44

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

format/csv/Tools.hx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,19 +145,19 @@ class Tools {
145145
// other tools ------------------------------------------------------------------------------------------------------
146146

147147
public static inline function getBufContents( b:BytesBuffer, utf8:Bool, ?pos=0, ?len=-1 ):String {
148-
if ( len == -1 ) len = b.length - pos;
148+
var bytes = b.getBytes();
149+
if ( len == -1 ) len = bytes.length - pos;
149150
#if ( neko || cpp )
150-
return len > 0 ? b.getBytes().readString( pos, len ) : "";
151+
return len > 0 ? bytes.readString( pos, len ) : "";
151152
#else
152153
if ( len == 0 ) {
153154
return "";
154155
}
155156
else if ( utf8 ) {
156-
return len > 0 ? b.getBytes().readString( pos, len ) : "";
157+
return len > 0 ? bytes.readString( pos, len ) : "";
157158
}
158159
else {
159160
var sbuf = new StringBuf();
160-
var bytes = b.getBytes();
161161
for ( i in pos...(pos+len) ) {
162162
sbuf.addChar( bytes.get( i ) );
163163
}

format/ett/Reader.hx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,9 @@ class ETTReader {
165165
i++;
166166
}
167167
if ( i == kb.length ) {
168-
var bufLen = buf.length;
169-
return buf.getBytes().sub( 0, bufLen - kb.length );
168+
var bytes = buf.getBytes();
169+
var bufLen = bytes.length;
170+
return bytes.sub( 0, bufLen - kb.length );
170171
}
171172
}
172173
return null;

0 commit comments

Comments
 (0)