projects
/
ruby-eet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Chunk.deserialize doesn't modify its argument any more.
[ruby-eet.git]
/
lib
/
eet.rb
diff --git
a/lib/eet.rb
b/lib/eet.rb
index 266a9e3b86572224c9d18d5f7713b43172a00b92..fa9f090e851672f5430c6dacb2731824c5f35f78 100644
(file)
--- a/
lib/eet.rb
+++ b/
lib/eet.rb
@@
-1,5
+1,5
@@
#--
#--
-# $Id: eet.rb 4
0 2005-05-18 19:04:52
Z tilman $
+# $Id: eet.rb 4
4 2005-05-25 19:51:25
Z tilman $
#
# Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
#
#
# Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
#
@@
-169,9
+169,13
@@
module Eet
def Stream.deserialize(data)
data = data.to_str.dup
s = Stream.new
def Stream.deserialize(data)
data = data.to_str.dup
s = Stream.new
+ offset = 0
- while data.length > 0
- s << Chunk.deserialize(data)
+ while offset < data.length
+ c, bytes = Chunk.deserialize(data[offset..-1])
+
+ s << c
+ offset += bytes
end
s
end
s
@@
-213,9
+217,7
@@
module Eet
c = Chunk.new(*data[8, size].split("\0", 2))
c = Chunk.new(*data[8, size].split("\0", 2))
- data.replace(data[8 + size..-1] || "")
-
- c
+ [c, 8 + size]
end
end
end
end
end
end