From e7e948a5bffcae50a5faad489536a572fe4c8583 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 6 Dec 2011 13:47:29 +0100 Subject: [PATCH] filesrc: cleanup error path --- plugins/elements/gstfilesrc.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/plugins/elements/gstfilesrc.c b/plugins/elements/gstfilesrc.c index 165031ac99..1e35ab4731 100644 --- a/plugins/elements/gstfilesrc.c +++ b/plugins/elements/gstfilesrc.c @@ -518,7 +518,7 @@ no_filename: { GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND, (_("No file name specified for reading.")), (NULL)); - return FALSE; + goto error_exit; } open_failed: { @@ -533,29 +533,30 @@ open_failed: GST_ERROR_SYSTEM); break; } - return FALSE; + goto error_exit; } no_stat: { GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (_("Could not get info on \"%s\"."), src->filename), (NULL)); - close (src->fd); - return FALSE; + goto error_close; } was_directory: { GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (_("\"%s\" is a directory."), src->filename), (NULL)); - close (src->fd); - return FALSE; + goto error_close; } was_socket: { GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (_("File \"%s\" is a socket."), src->filename), (NULL)); - close (src->fd); - return FALSE; + goto error_close; } +error_close: + close (src->fd); +error_exit: + return FALSE; } /* unmap and close the file */