From 85a5c67234827253e881bdf021a8c82e770cbb65 Mon Sep 17 00:00:00 2001
From: Michael Yang <mikkyangg@gmail.com>
Date: Sat, 5 Jul 2014 20:28:24 -0400
Subject: [PATCH] Shorten WriteNullTermString

---
 encodedbytes/writer.go | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/encodedbytes/writer.go b/encodedbytes/writer.go
index 6afae71..2e0658c 100644
--- a/encodedbytes/writer.go
+++ b/encodedbytes/writer.go
@@ -4,6 +4,7 @@
 package encodedbytes
 
 import (
+	"bytes"
 	"io"
 )
 
@@ -49,17 +50,13 @@ func (w *Writer) WriteString(s string, encoding byte) (err error) {
 }
 
 func (w *Writer) WriteNullTermString(s string, encoding byte) (err error) {
-	err = w.WriteString(s, encoding)
-	if err == nil {
-		nullLength := EncodingMap[encoding].NullLength
-
-		for i := 0; i < nullLength; i++ {
-			err = w.WriteByte(0)
-			if err != nil {
-				return
-			}
-		}
+	if err = w.WriteString(s, encoding); err != nil {
+		return
 	}
+
+	nullLength := EncodingNullLengthForIndex(encoding)
+	_, err = w.Write(bytes.Repeat([]byte{0x0}, nullLength))
+
 	return
 }