From e6d0ea10229f04d34e8e1ce7d3d3fbd4394ebb8c Mon Sep 17 00:00:00 2001 From: Pawel Jakub Dawidek Date: Tue, 1 May 2007 23:33:12 +0000 Subject: [PATCH] Do some cleanups (like freeing memory and closing file descriptors) before leaving the functions. --- sbin/geom/class/eli/geom_eli.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sbin/geom/class/eli/geom_eli.c b/sbin/geom/class/eli/geom_eli.c index 3bf4fdc3444e..ea2bbaea9edf 100644 --- a/sbin/geom/class/eli/geom_eli.c +++ b/sbin/geom/class/eli/geom_eli.c @@ -1053,7 +1053,7 @@ eli_backup(struct gctl_req *req) } if (provfd == -1) { gctl_error(req, "Cannot open %s: %s.", prov, strerror(errno)); - return; + goto out; } filefd = open(file, O_WRONLY | O_TRUNC | O_CREAT, 0600); if (filefd == -1) { @@ -1066,13 +1066,13 @@ eli_backup(struct gctl_req *req) if (mediasize == 0 || secsize == 0) { gctl_error(req, "Cannot get informations about %s: %s.", prov, strerror(errno)); - return; + goto out; } sector = malloc(secsize); if (sector == NULL) { gctl_error(req, "Cannot allocate memory."); - return; + goto out; } /* Read metadata from the provider. */ @@ -1139,7 +1139,7 @@ eli_restore(struct gctl_req *req) } if (provfd == -1) { gctl_error(req, "Cannot open %s: %s.", prov, strerror(errno)); - return; + goto out; } mediasize = g_get_mediasize(prov); @@ -1147,13 +1147,13 @@ eli_restore(struct gctl_req *req) if (mediasize == 0 || secsize == 0) { gctl_error(req, "Cannot get informations about %s: %s.", prov, strerror(errno)); - return; + goto out; } sector = malloc(secsize); if (sector == NULL) { gctl_error(req, "Cannot allocate memory."); - return; + goto out; } /* Read metadata from the backup file. */