[libvirt] [PATCH 1/7] datatypes: avoid redundant __FUNCTION__

Matthias Bolte matthias.bolte at googlemail.com
Fri Jan 14 21:45:08 UTC 2011


2011/1/14 Eric Blake <eblake at redhat.com>:
> virLibConnError already includes __FUNCTION__ in its output, so we
> were redundant.  Furthermore, clang warns that __FUNCTION__ is not
> a string literal (at least __FUNCTION__ will never contain %, so
> it was not a security risk).

> @@ -344,8 +344,16 @@ virGetDomain(virConnectPtr conn, const char *name, const unsigned char *uuid) {
>     virDomainPtr ret = NULL;
>     char uuidstr[VIR_UUID_STRING_BUFLEN];
>
> -    if ((!VIR_IS_CONNECT(conn)) || (name == NULL) || (uuid == NULL)) {
> -        virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
> +    if (!VIR_IS_CONNECT(conn)) {
> +        virLibConnError(VIR_ERR_INVALID_ARG, _("no connection"));
> +        return(NULL);
> +    }

Small cosmetic nit: "return isn't a function". I know you just keep in
line with the existing style in this file :)

ACK.

Matthias




More information about the libvir-list mailing list