aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-07-17 14:42:08 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-07-17 14:42:08 +0200
commita6ed0b51c8a04fbbc0bbf0aec4b0fdb20e52760d (patch)
tree7f02340f6629b575273fd4f02690792fe61810c2
parent631d34ea85961e1b7a6eaa864ee2d91476cbe922 (diff)
Move
-rw-r--r--zsig/header.go (renamed from zhead/header.go)16
-rw-r--r--zsig/header_test.go (renamed from zhead/header_test.go)8
2 files changed, 12 insertions, 12 deletions
diff --git a/zhead/header.go b/zsig/header.go
index c330b59..aa1c13b 100644
--- a/zhead/header.go
+++ b/zsig/header.go
@@ -1,4 +1,4 @@
-package zhead
+package zsig
import (
"bufio"
@@ -10,7 +10,7 @@ import (
"time"
)
-type Header struct {
+type ZHeader struct {
Date time.Time
KeyFile string
Alg string
@@ -23,7 +23,7 @@ const (
DefaultBlockSize = 65536
)
-func (h Header) Print(w io.Writer) error {
+func (h ZHeader) Print(w io.Writer) error {
fmt.Fprintf(w, "date=%v\n", h.Date.Format(time.RFC3339))
fmt.Fprintf(w, "key=%v\n", h.KeyFile)
fmt.Fprintf(w, "algorithm=%v\n", h.Alg)
@@ -34,8 +34,8 @@ func (h Header) Print(w io.Writer) error {
return nil
}
-func Parse(r io.Reader) (Header, error) {
- var h Header
+func Parse(r io.Reader) (ZHeader, error) {
+ var h ZHeader
s := bufio.NewScanner(r)
for s.Scan() {
line := s.Text()
@@ -43,7 +43,7 @@ func Parse(r io.Reader) (Header, error) {
case strings.HasPrefix(line, "date="):
t, err := time.Parse(time.RFC3339, line[5:])
if err != nil {
- return Header{}, err
+ return ZHeader{}, err
}
h.Date = t
case strings.HasPrefix(line, "key="):
@@ -53,7 +53,7 @@ func Parse(r io.Reader) (Header, error) {
case strings.HasPrefix(line, "blocksize="):
i, err := strconv.Atoi(line[10:])
if err != nil {
- return Header{}, err
+ return ZHeader{}, err
}
h.BlockSize = i
case line == "":
@@ -61,7 +61,7 @@ func Parse(r io.Reader) (Header, error) {
line = s.Text()
sum, err := hex.DecodeString(line)
if err != nil {
- return Header{}, err
+ return ZHeader{}, err
}
h.Sums = append(h.Sums, sum)
}
diff --git a/zhead/header_test.go b/zsig/header_test.go
index 6b1bc08..ca10b27 100644
--- a/zhead/header_test.go
+++ b/zsig/header_test.go
@@ -1,4 +1,4 @@
-package zhead
+package zsig
import (
"bytes"
@@ -6,12 +6,12 @@ import (
"time"
)
-func TestHeader(t *testing.T) {
+func TestZHeader(t *testing.T) {
date, err := time.Parse(time.UnixDate, "Mon Jan 2 15:04:05 UTC 2006")
if err != nil {
t.Fatal(err)
}
- h := Header{
+ h := ZHeader{
Date: date,
KeyFile: "some.key",
Alg: DefaultAlg,
@@ -32,7 +32,7 @@ func TestHeader(t *testing.T) {
cmp(t, head, h)
}
-func cmp(t *testing.T, got, want Header) {
+func cmp(t *testing.T, got, want ZHeader) {
if !got.Date.Equal(want.Date) {
t.Errorf("got %v; want %v", got.Date, want.Date)
}