Merge pull request #214 from harshavardhana/pr_out_remove_donut_gen_binary_and_update_crc32c_function

This commit is contained in:
Harshavardhana 2015-02-27 14:42:22 -08:00
commit 01e84c596c
5 changed files with 8 additions and 11 deletions

View File

@ -119,10 +119,8 @@ func (donut *Donut) WriteEnd(target io.Writer, donutFormat DonutFormat) error {
if err := binary.Write(&tempBuffer, binary.LittleEndian, donutFormat.BlockEnd); err != nil { if err := binary.Write(&tempBuffer, binary.LittleEndian, donutFormat.BlockEnd); err != nil {
return err return err
} }
crc, err := crc32c.Crc32c(tempBuffer.Bytes())
if err != nil { crc := crc32c.Sum32(tempBuffer.Bytes())
return err
}
if err := binary.Write(target, binary.LittleEndian, crc); err != nil { if err := binary.Write(target, binary.LittleEndian, crc); err != nil {
return err return err
} }
@ -169,10 +167,7 @@ func (donut *Donut) WriteBegin(target io.Writer, donutFormat DonutFormat) error
if err := binary.Write(&headerBytes, binary.LittleEndian, donutFormat.GobHeader); err != nil { if err := binary.Write(&headerBytes, binary.LittleEndian, donutFormat.GobHeader); err != nil {
return err return err
} }
crc, err := crc32c.Crc32c(headerBytes.Bytes()) crc := crc32c.Sum32(headerBytes.Bytes())
if err != nil {
return err
}
if err := binary.Write(&headerBytes, binary.LittleEndian, crc); err != nil { if err := binary.Write(&headerBytes, binary.LittleEndian, crc); err != nil {
return err return err
} }

View File

@ -0,0 +1,2 @@
donut_gen
hello

View File

@ -12,7 +12,7 @@ import (
func main() { func main() {
fmt.Println("--start") fmt.Println("--start")
file, err := os.OpenFile("newfile", os.O_WRONLY|os.O_CREATE, 0666) file, err := os.OpenFile("hello", os.O_WRONLY|os.O_CREATE, 0666)
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -30,10 +30,10 @@ func main() {
fmt.Println("--closed") fmt.Println("--closed")
fmt.Println("--verify") fmt.Println("--verify")
stat, _ := os.Stat("newfile") stat, _ := os.Stat("hello")
fileSize := stat.Size() fileSize := stat.Size()
rfile, _ := os.OpenFile("newfile", os.O_RDONLY, 0666) rfile, _ := os.OpenFile("hello", os.O_RDONLY, 0666)
blockStart := make([]byte, 4) blockStart := make([]byte, 4)
blockStartCheck := []byte{'M', 'I', 'N', 'I'} blockStartCheck := []byte{'M', 'I', 'N', 'I'}