an/conf
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

make goconf compile with latest weekly.

Browse source
This commit is contained in:
Andreas Krennmair 2012-01-29 01:52:54 +01:00
parent f602e48a7b
commit bf7cc3a37c
4 changed files with 24 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

14
read.go
View file

@ -1,16 +1,16 @@
package conf
import (
"bufio"
"bytes"
"io"
"os"
"bytes"
"bufio"
"strings"
)
// ReadConfigFile reads a file and returns a new configuration representation.
// This representation can be queried with GetString, etc.
func ReadConfigFile(fname string) (c *ConfigFile, err os.Error) {
func ReadConfigFile(fname string) (c *ConfigFile, err error) {
var file *os.File
if file, err = os.Open(fname); err != nil {
@ -29,7 +29,7 @@ func ReadConfigFile(fname string) (c *ConfigFile, err os.Error) {
return c, nil
}
func ReadConfigBytes(conf []byte) (c *ConfigFile, err os.Error) {
func ReadConfigBytes(conf []byte) (c *ConfigFile, err error) {
buf := bytes.NewBuffer(conf)
c = NewConfigFile()
@ -42,7 +42,7 @@ func ReadConfigBytes(conf []byte) (c *ConfigFile, err os.Error) {
// Read reads an io.Reader and returns a configuration representation. This
// representation can be queried with GetString, etc.
func (c *ConfigFile) Read(reader io.Reader) (err os.Error) {
func (c *ConfigFile) Read(reader io.Reader) (err error) {
buf := bufio.NewReader(reader)
var section, option string
@ -52,7 +52,7 @@ func (c *ConfigFile) Read(reader io.Reader) (err os.Error) {
l = strings.TrimSpace(l)
if buferr != nil {
if buferr != os.EOF {
if buferr != io.EOF {
return err
}
@ -103,7 +103,7 @@ func (c *ConfigFile) Read(reader io.Reader) (err os.Error) {
}
// Reached end of file
if buferr == os.EOF {
if buferr == io.EOF {
break
}
}