Skip to content

Commit

Permalink
use %v instead of %w
Browse files Browse the repository at this point in the history
  • Loading branch information
qmuntal committed Oct 18, 2019
1 parent 4bf0b86 commit 6a919e3
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions package.go
Expand Up @@ -9,8 +9,8 @@ package opc

import (
"encoding/xml"
"io"
"fmt"
"io"
"mime"
"path/filepath"
"sort"
Expand Down Expand Up @@ -276,7 +276,7 @@ func (c *CoreProperties) encode(w io.Writer) error {
func decodeCoreProperties(r io.Reader) (*CoreProperties, error) {
propDecode := new(corePropertiesXMLUnmarshal)
if err := xml.NewDecoder(r).Decode(propDecode); err != nil {
return nil, fmt.Errorf("opc: %s: cannot be decoded: %w", contentTypesName, err)
return nil, fmt.Errorf("opc: %s: cannot be decoded: %v", contentTypesName, err)
}
prop := &CoreProperties{Category: propDecode.Category, ContentStatus: propDecode.ContentStatus,
Created: propDecode.Created, Creator: propDecode.Creator, Description: propDecode.Description,
Expand Down
2 changes: 1 addition & 1 deletion part.go
Expand Up @@ -117,7 +117,7 @@ func validatePartName(name string) error {
func validateURL(name string) error {
encodedURL, err := url.Parse(name)
if err != nil {
return fmt.Errorf("opc: %s: invalid url: %w", name, err)
return fmt.Errorf("opc: %s: invalid url: %v", name, err)
}

if name[0] != '/' || encodedURL.IsAbs() {
Expand Down
10 changes: 5 additions & 5 deletions reader.go
Expand Up @@ -157,23 +157,23 @@ func (r *Reader) loadContentType(file archiveFile) (*contentTypes, error) {
// Process descrived in ISO/IEC 29500-2 §10.1.2.4
reader, err := file.Open()
if err != nil {
return nil, fmt.Errorf("opc: %s: cannot be opened: %w", contentTypesName, err)
return nil, fmt.Errorf("opc: %s: cannot be opened: %v", contentTypesName, err)
}
return decodeContentTypes(reader)
}

func (r *Reader) loadCoreProperties(file archiveFile) (*CoreProperties, error) {
reader, err := file.Open()
if err != nil {
return nil, fmt.Errorf("opc: %s: cannot be opened: %w", r.Properties.PartName, err)
return nil, fmt.Errorf("opc: %s: cannot be opened: %v", r.Properties.PartName, err)
}
return decodeCoreProperties(reader)
}

func loadRelationships(file archiveFile, rels *relationshipsPart) error {
reader, err := file.Open()
if err != nil {
return fmt.Errorf("opc: %s: cannot be opened: %w", file.Name(), err)
return fmt.Errorf("opc: %s: cannot be opened: %v", file.Name(), err)
}
rls, err := decodeRelationships(reader, file.Name())
if err != nil {
Expand All @@ -190,7 +190,7 @@ func loadRelationships(file archiveFile, rels *relationshipsPart) error {
func (r *Reader) loadPackageRelationships(file archiveFile) error {
reader, err := file.Open()
if err != nil {
return fmt.Errorf("opc: %s: cannot be opened: %w", file.Name(), err)
return fmt.Errorf("opc: %s: cannot be opened: %v", file.Name(), err)
}
rls, err := decodeRelationships(reader, file.Name())
if err != nil {
Expand Down Expand Up @@ -237,7 +237,7 @@ func (m *mixed) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
func decodeContentTypes(r io.Reader) (*contentTypes, error) {
ctdecode := new(contentTypesXMLReader)
if err := xml.NewDecoder(r).Decode(ctdecode); err != nil {
return nil, fmt.Errorf("opc: %s: cannot be decoded: %w", contentTypesName, err)
return nil, fmt.Errorf("opc: %s: cannot be decoded: %v", contentTypesName, err)
}
ct := new(contentTypes)
for _, c := range ctdecode.Types {
Expand Down
2 changes: 1 addition & 1 deletion relationship.go
Expand Up @@ -160,7 +160,7 @@ func encodeRelationships(w io.Writer, rs []*Relationship) error {
func decodeRelationships(r io.Reader, partName string) ([]*Relationship, error) {
relDecode := new(relationshipsXML)
if err := xml.NewDecoder(r).Decode(relDecode); err != nil {
return nil, fmt.Errorf("opc: %s: cannot be decoded: %w", partName, err)
return nil, fmt.Errorf("opc: %s: cannot be decoded: %v", partName, err)
}
rel := make([]*Relationship, len(relDecode.RelsXML))
for i, rl := range relDecode.RelsXML {
Expand Down
2 changes: 1 addition & 1 deletion writer.go
Expand Up @@ -183,7 +183,7 @@ func (w *Writer) addToPackage(part *Part, compression CompressionOption) (io.Wri
pw, err := w.w.CreateHeader(fh)
if err != nil {
w.p.deletePart(part.Name)
return nil, fmt.Errorf("opc: %s: cannot be created: %w", part.Name, err)
return nil, fmt.Errorf("opc: %s: cannot be created: %v", part.Name, err)
}
return pw, nil
}
Expand Down

0 comments on commit 6a919e3

Please sign in to comment.