Re: [libvirt] [PATCH v3] bye to close(), welcome to VIR_(FORCE_)CLOSE()

Now that 0.8.5 is out, here is another posting of this big cleanup patch.

There were some problems with Eric's suggested cfg.mk extension (showing contents of error messages with 'close' as text), so I could not add the 'sc_avoid_close' to it.

I again put the diff of tree+v3 against tree+v1 to the end of the patch. I forward-ported V1 for that.

Index: libvirt-acl/src/libvirt.c =================================================================== --- libvirt-acl.orig/src/libvirt.c +++ libvirt-acl/src/libvirt.c @@ -10794,7 +10794,7 @@ virStreamRef(virStreamPtr stream) * ... report an error .... * done: * virStreamFree(st); - * close(fd); + * VIR_FORCE_CLOSE(fd); * * Returns the number of bytes written, which may be less * than requested. @@ -10884,8 +10884,8 @@ error: * ... report an error .... * done: * virStreamFree(st); - * close(fd); - * + * if (VIR_CLOSE(fd) < 0) + * virReportSystemError(errno, "%s", _("failed to close file")); * * Returns the number of bytes read, which may be less * than requested. @@ -10964,7 +10964,7 @@ error: * if (virStreamFinish(st) < 0) * ...report an error... * virStreamFree(st); - * close(fd); + * VIR_FORCE_CLOSE(fd); * * Returns 0 if all the data was successfully sent. The caller * should invoke virStreamFinish(st) to flush the stream upon

@@ -11061,7 +11061,7 @@ cleanup: * if (virStreamFinish(st) < 0) * ...report an error... * virStreamFree(st); - * close(fd); + * VIR_FORCE_CLOSE(fd);

Index: libvirt-acl/src/phyp/phyp_driver.c =================================================================== @@ -764,7 +769,11 @@ phypUUIDTable_Pull(virConnectPtr conn) } break; } - close(fd); + if (VIR_CLOSE(fd) < 0) { + virReportSystemError(errno, _("Could not close %s\n"), + local_file); + goto err; + } goto exit; exit:

Index: libvirt-acl/src/xen/proxy_internal.c =================================================================== --- libvirt-acl.orig/src/xen/proxy_internal.c +++ libvirt-acl/src/xen/proxy_internal.c

Index: libvirt-acl/proxy/libvirt_proxy.c =================================================================== --- libvirt-acl.orig/proxy/libvirt_proxy.c +++ libvirt-acl/proxy/libvirt_proxy.c