[Groonga-commit] groonga/grnci at cb64a37 [master] Use json.Marshal to encode Text.

Back to archive index

Susumu Yata null+****@clear*****
Fri Apr 1 13:24:19 JST 2016


Susumu Yata	2016-04-01 13:24:19 +0900 (Fri, 01 Apr 2016)

  New Revision: cb64a37d5867565bdb391a5943d112956854bf2d
  https://github.com/groonga/grnci/commit/cb64a37d5867565bdb391a5943d112956854bf2d

  Message:
    Use json.Marshal to encode Text.
    
    GitHub: #34

  Modified files:
    type.go

  Modified: type.go (+6 -3)
===================================================================
--- type.go    2016-02-19 00:51:53 +0900 (862e97e)
+++ type.go    2016-04-01 13:24:19 +0900 (506305b)
@@ -2,6 +2,7 @@ package grnci
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
 	"reflect"
 	"strconv"
@@ -99,9 +100,11 @@ func (val *Text) writeTo(buf *bytes.Buffer) error {
 		_, err := buf.WriteString("null")
 		return err
 	}
-	str := strings.Replace(string(*val), "\\", "\\\\", -1)
-	str = strings.Replace(str, "\"", "\\\"", -1)
-	_, err := fmt.Fprintf(buf, "\"%s\"", str)
+	data, err := json.Marshal(val)
+	if err != nil {
+		return err
+	}
+	_, err = buf.Write(data)
 	return err
 }
 
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index