Skip to content

Commit 81e950b

Browse files
committed
関数の最後を必ずreturnで終える
go 1.1以降では条件分岐を見てreturnせずに関数を抜けるパスが無いことをチェックしてくれるけど、 go 1.0では最後にreturnがあるかしかチェックしてくれてないっぽい
1 parent 9edaad2 commit 81e950b

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

table.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,8 @@ func (f *TableFile) GetResource(id ResId, config *ResTableConfig) (interface{},
174174
return v.Data, nil
175175
case TYPE_INT_BOOLEAN:
176176
return v.Data != 0, nil
177-
default:
178-
return v.Data, nil
179177
}
178+
return v.Data, nil
180179
}
181180

182181
func (f *TableFile) GetString(ref ResStringPoolRef) string {

xml.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,8 @@ func (f *XMLFile) addNamespacePrefix(ns, name ResStringPoolRef) string {
153153
if ns != NilResStringPoolRef {
154154
prefix := f.GetString(f.namespaces[ns])
155155
return fmt.Sprintf("%s:%s", prefix, f.GetString(name))
156-
} else {
157-
return f.GetString(name)
158156
}
157+
return f.GetString(name)
159158
}
160159

161160
func (f *XMLFile) readStartElement(sr *io.SectionReader) error {

0 commit comments

Comments
 (0)