External/libvirt
1
0
Fork 0
Code

virfdstream: Use VIR_AUTOCLOSE()

Browse Source 
Again, instead of closing FDs explicitly, we can automatically
close them when they go out of their respective scopes.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Michal Privoznik 2020-07-07 14:39:22 +02:00
parent 4bbe816d9f
commit 2d3ac83670
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/virfdstream.c
View File

@ -571,9 +571,9 @@ virFDStreamThread(void *opaque)
virStreamPtr st = data->st; virStreamPtr st = data->st;
size_t length = data->length; size_t length = data->length;
bool sparse = data->sparse; bool sparse = data->sparse;
int fdin = data->fdin; VIR_AUTOCLOSE fdin = data->fdin;
char *fdinname = data->fdinname; char *fdinname = data->fdinname;
int fdout = data->fdout; VIR_AUTOCLOSE fdout = data->fdout;
char *fdoutname = data->fdoutname; char *fdoutname = data->fdoutname;
virFDStreamDataPtr fdst = st->privateData; virFDStreamDataPtr fdst = st->privateData;
bool doRead = fdst->threadDoRead; bool doRead = fdst->threadDoRead;
@ -633,8 +633,6 @@ virFDStreamThread(void *opaque)
virObjectUnref(fdst); virObjectUnref(fdst);
if (virFDStreamDataDisposed) if (virFDStreamDataDisposed)
st->privateData = NULL; st->privateData = NULL;
VIR_FORCE_CLOSE(fdin);
VIR_FORCE_CLOSE(fdout);
virFDStreamThreadDataFree(data); virFDStreamThreadDataFree(data);
return; return;
@ -1160,9 +1158,10 @@ int virFDStreamConnectUNIX(virStreamPtr st,
{ {
struct sockaddr_un sa; struct sockaddr_un sa;
virTimeBackOffVar timeout; virTimeBackOffVar timeout;
VIR_AUTOCLOSE fd = -1;
int ret; int ret;
int fd = socket(AF_UNIX, SOCK_STREAM, 0); fd = socket(AF_UNIX, SOCK_STREAM, 0);
if (fd < 0) { if (fd < 0) {
virReportSystemError(errno, "%s", _("Unable to open UNIX socket")); virReportSystemError(errno, "%s", _("Unable to open UNIX socket"));
goto error; goto error;
@ -1197,10 +1196,11 @@ int virFDStreamConnectUNIX(virStreamPtr st,
if (virFDStreamOpenInternal(st, fd, NULL, 0) < 0) if (virFDStreamOpenInternal(st, fd, NULL, 0) < 0)
goto error; goto error;
fd = -1;
return 0; return 0;
error: error:
VIR_FORCE_CLOSE(fd);
return -1; return -1;
} }