@@ -8,12 +8,17 @@ import (
88 cbg "github.com/whyrusleeping/cbor-gen"
99)
1010
11+ var keyZero = []byte ("0" )
12+ var keyOne = []byte ("1" )
13+
1114func (t * Pointer ) MarshalCBOR (w io.Writer ) error {
1215 if t .Link != cid .Undef && len (t .KVs ) > 0 {
1316 return fmt .Errorf ("hamt Pointer cannot have both a link and KVs" )
1417 }
1518
16- if err := cbg .CborWriteHeader (w , cbg .MajMap , 1 ); err != nil {
19+ scratch := make ([]byte , 9 )
20+
21+ if err := cbg .WriteMajorTypeHeaderBuf (scratch , w , cbg .MajMap , 1 ); err != nil {
1722 return err
1823 }
1924
@@ -22,28 +27,28 @@ func (t *Pointer) MarshalCBOR(w io.Writer) error {
2227 // Refmt (and the general IPLD data model currently) can't deal
2328 // with non string keys. So we have this weird restriction right now
2429 // hoping to be able to use integer keys soon
25- if err := cbg .CborWriteHeader ( w , cbg .MajTextString , 1 ); err != nil {
30+ if err := cbg .WriteMajorTypeHeaderBuf ( scratch , w , cbg .MajTextString , 1 ); err != nil {
2631 return err
2732 }
2833
29- if _ , err := w .Write ([] byte ( "0" ) ); err != nil {
34+ if _ , err := w .Write (keyZero ); err != nil {
3035 return err
3136 }
3237
33- if err := cbg .WriteCid ( w , t .Link ); err != nil {
38+ if err := cbg .WriteCidBuf ( scratch , w , t .Link ); err != nil {
3439 return err
3540 }
3641 } else {
3742 // key for KVs is "1"
38- if err := cbg .CborWriteHeader ( w , cbg .MajTextString , 1 ); err != nil {
43+ if err := cbg .WriteMajorTypeHeaderBuf ( scratch , w , cbg .MajTextString , 1 ); err != nil {
3944 return err
4045 }
4146
42- if _ , err := w .Write ([] byte ( "1" ) ); err != nil {
47+ if _ , err := w .Write (keyOne ); err != nil {
4348 return err
4449 }
4550
46- if err := cbg .CborWriteHeader ( w , cbg .MajArray , uint64 (len (t .KVs ))); err != nil {
51+ if err := cbg .WriteMajorTypeHeaderBuf ( scratch , w , cbg .MajArray , uint64 (len (t .KVs ))); err != nil {
4752 return err
4853 }
4954
@@ -58,7 +63,9 @@ func (t *Pointer) MarshalCBOR(w io.Writer) error {
5863}
5964
6065func (t * Pointer ) UnmarshalCBOR (br io.Reader ) error {
61- maj , extra , err := cbg .CborReadHeader (br )
66+ scratch := make ([]byte , 8 )
67+
68+ maj , extra , err := cbg .CborReadHeaderBuf (br , scratch )
6269 if err != nil {
6370 return err
6471 }
@@ -70,7 +77,7 @@ func (t *Pointer) UnmarshalCBOR(br io.Reader) error {
7077 return fmt .Errorf ("Pointers should be a single element map" )
7178 }
7279
73- maj , val , err := cbg .CborReadHeader (br )
80+ maj , val , err := cbg .CborReadHeaderBuf (br , scratch )
7481 if err != nil {
7582 return err
7683 }
@@ -83,21 +90,20 @@ func (t *Pointer) UnmarshalCBOR(br io.Reader) error {
8390 return fmt .Errorf ("map keys in pointers must be a single byte long" )
8491 }
8592
86- var b [1 ]byte
87- if _ , err := io .ReadFull (br , b [:]); err != nil {
93+ if _ , err := io .ReadAtLeast (br , scratch [:1 ], 1 ); err != nil {
8894 return err
8995 }
9096
91- switch string ( b [:]) {
92- case "0" :
97+ switch scratch [ 0 ] {
98+ case '0' :
9399 c , err := cbg .ReadCid (br )
94100 if err != nil {
95101 return err
96102 }
97103 t .Link = c
98104 return nil
99- case "1" :
100- maj , length , err := cbg .CborReadHeader (br )
105+ case '1' :
106+ maj , length , err := cbg .CborReadHeaderBuf (br , scratch )
101107 if err != nil {
102108 return err
103109 }
0 commit comments