On Fri, May 19, 2017 at 09:03:12AM -0400, John Ferlan wrote:
> Use @obj for a virNetworkObjPtr
>
> Use @net for a virNetworkPtr
>
> Clean up the bridge_driver.h
>
> Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx>
> ---
> src/network/bridge_driver.c | 966 ++++++++++++++++++++++----------------------
> src/network/bridge_driver.h | 50 ++-
> 2 files changed, 511 insertions(+), 505 deletions(-)
[...]
> diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h
> index 7832b60..6d9aece 100644
> --- a/src/network/bridge_driver.h
> +++ b/src/network/bridge_driver.h
> @@ -31,37 +31,49 @@
> # include "virdnsmasq.h"
> # include "virnetworkobj.h"
>
> -int networkRegister(void);
> +int
> +networkRegister(void);
>
> # if WITH_NETWORK
> -int networkAllocateActualDevice(virDomainDefPtr dom,
> - virDomainNetDefPtr iface)
> +int
> +networkAllocateActualDevice(virDomainDefPtr dom,
> + virDomainNetDefPtr iface)
> ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
> -void networkNotifyActualDevice(virDomainDefPtr dom,
> - virDomainNetDefPtr iface)
> +
> +void
> +networkNotifyActualDevice(virDomainDefPtr dom,
> + virDomainNetDefPtr iface)
> ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
> -int networkReleaseActualDevice(virDomainDefPtr dom,
> - virDomainNetDefPtr iface)
> +
> +int
> +networkReleaseActualDevice(virDomainDefPtr dom,
> + virDomainNetDefPtr iface)
> ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
>
> -int networkGetNetworkAddress(const char *netname, char **netaddr)
> +int
> +networkGetNetworkAddress(const char *netname,
> + char **netaddr)
> ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
>
> -int networkGetActualType(virDomainNetDefPtr iface)
> +int
> +networkGetActualType(virDomainNetDefPtr iface)
> ATTRIBUTE_NONNULL(1);
>
> -int networkDnsmasqConfContents(virNetworkObjPtr network,
> - const char *pidfile,
> - char **configstr,
> - dnsmasqContext *dctx,
> - dnsmasqCapsPtr caps);
> +int
> +networkDnsmasqConfContents(virNetworkObjPtr obj,
> + const char *pidfile,
> + char **configstr,
> + dnsmasqContext *dctx,
> + dnsmasqCapsPtr caps);
>
> -bool networkBandwidthChangeAllowed(virDomainNetDefPtr iface,
> - virNetDevBandwidthPtr newBandwidth)
> +bool
> +networkBandwidthChangeAllowed(virDomainNetDefPtr iface,
> + virNetDevBandwidthPtr newBandwidth)
> ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
>
> -int networkBandwidthUpdate(virDomainNetDefPtr iface,
> - virNetDevBandwidthPtr newBandwidth)
> +int
> +networkBandwidthUpdate(virDomainNetDefPtr iface,
> + virNetDevBandwidthPtr newBandwidth)
> ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
>
> # else
> @@ -80,7 +92,7 @@ networkNotifyActualDevice(virDomainDefPtr dom ATTRIBUTE_UNUSED,
>
> static inline int
> networkReleaseActualDevice(virDomainDefPtr dom ATTRIBUTE_UNUSED,
> - virDomainNetDefPtr iface ATTRIBUTE_UNUSED)
> + virDomainNetDefPtr iface ATTRIBUTE_UNUSED)
> {
> return 0;
> }
The formatting change for this file should have been part of the
previous patch which is already pushed. Split the formatting change
into a separate patch. The rename part is correct.
Reviewed-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
Attachment:
signature.asc
Description: Digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
