RepoMirrors
/
go-ceph
mirror of https://github.com/ceph/go-ceph
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rados: convert less-than-zero error checks to getRadosError 

A number of the error handling checks do not seem to need to check
for specific non-zero error returns so we should be able to
convert to getRadosError rather than a lot of boiler-plate.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
John Mulligan 2019-12-20 13:37:10 -05:00 committed by Niels de Vos
parent d7bcba78dd
commit bb375f68ac
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rados/conn.go
View File

@ -128,11 +128,7 @@ func (c *Conn) SetConfigOption(option, value string) error {
defer C.free(unsafe.Pointer(c_opt))
defer C.free(unsafe.Pointer(c_val))
ret := C.rados_conf_set(c.cluster, c_opt, c_val)
if ret < 0 {
return RadosError(int(ret))
} else {
return nil
}
return getRadosError(int(ret))
}
// GetConfigOption returns the value of the Ceph configuration option
@ -158,11 +154,7 @@ func (c *Conn) GetConfigOption(name string) (value string, err error) {
// retrieved.
func (c *Conn) WaitForLatestOSDMap() error {
ret := C.rados_wait_for_latest_osdmap(c.cluster)
if ret < 0 {
return RadosError(int(ret))
} else {
return nil
}
return getRadosError(int(ret))
}
func (c *Conn) ensure_connected() error {
@ -210,11 +202,7 @@ func (c *Conn) ParseCmdLineArgs(args []string) error {
}
ret := C.rados_conf_parse_argv(c.cluster, argc, &argv[0])
if ret < 0 {
return RadosError(int(ret))
} else {
return nil
}
return getRadosError(int(ret))
}
// ParseDefaultConfigEnv configures the connection from the default Ceph