From: Osier Yang <jyang(a)redhat.com>
(Osier was unable to send this to the list, so I'm sending it for him,
and simultaneously ACKing it.)
* src/drv_initscripts.c: "goto error" instead of "return -1", as
"add_augeas_xfm_table" has already done some initialization on
ncf->driver.
---
AUTHORS | 1 +
src/drv_initscripts.c | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 032b020..9e90585 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,3 +10,4 @@ Contributions by:
Daniel Berrange <berrange(a)redhat.com>
Cole Robinson <crobinso(a)redhat.com>
Eric Blake <eblake(a)redhat.com>
+ Osier Yang <jyang(a)redhat.com>
diff --git a/src/drv_initscripts.c b/src/drv_initscripts.c
index 90434e4..7b2930d 100644
--- a/src/drv_initscripts.c
+++ b/src/drv_initscripts.c
@@ -355,7 +355,7 @@ int drv_init(struct netcf *ncf) {
if (stat(ncf->root, &stats) != 0 || !S_ISDIR(stats.st_mode)) {
report_error(ncf, NETCF_EFILE,
"invalid root '%s' is not a directory",
ncf->root);
- return -1;
+ goto error;
}
// FIXME: Check for errors
--
1.7.3.4
Show replies by date