summaryrefslogtreecommitdiff
path: root/usr/austin/sym/binary.go
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2009-08-27 11:20:15 -0700
committerRuss Cox <rsc@golang.org>2009-08-27 11:20:15 -0700
commite0347fcfd827558d7b7a15995d61a17cb080b11d (patch)
tree4630cb5e26c85e719c02e5a360c3eaa04f42748f /usr/austin/sym/binary.go
parent43f160a74b60cb31146233bca5bd967539799aea (diff)
downloadgolang-e0347fcfd827558d7b7a15995d61a17cb080b11d.tar.gz
remove Line in bufio.ReadLine(Bytes|Slice|String)
also drop bool arg from ReadString R=r DELTA=45 (13 added, 1 deleted, 31 changed) OCL=33923 CL=33960
Diffstat (limited to 'usr/austin/sym/binary.go')
-rw-r--r--usr/austin/sym/binary.go8
1 files changed, 6 insertions, 2 deletions
diff --git a/usr/austin/sym/binary.go b/usr/austin/sym/binary.go
index d06179cec..015175d74 100644
--- a/usr/austin/sym/binary.go
+++ b/usr/austin/sym/binary.go
@@ -134,12 +134,16 @@ func (r *binaryReader) ReadInt64() int64 {
return int64(r.ReadUint64());
}
-// ReadCString reads a NULL-terminated string.
+// ReadCString reads a NUL-terminated string.
func (r *binaryReader) ReadCString() string {
- str, err := r.Reader.ReadLineString('\x00', false);
+ str, err := r.Reader.ReadString('\x00');
if r.err == nil && err != nil {
r.err = err;
}
+ n := len(str);
+ if n > 0 {
+ str = str[0:n-1];
+ }
return str;
}