[libvirt] [PATCH 03/14] nwfilter: remove virNWFilterHashTable typedefs entirely

[Jiri Denemark]

On Fri, Apr 27, 2018 at 16:25:02 +0100, Daniel P. Berrangé wrote:
> All the code now just uses the virHashTablePtr type directly.
> 
> Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
> ---
>  src/conf/domain_conf.c                 |  2 +-
>  src/conf/domain_conf.h                 |  2 +-
>  src/conf/nwfilter_conf.h               |  2 +-
>  src/conf/nwfilter_ipaddrmap.c          |  2 +-
>  src/conf/nwfilter_params.c             | 26 ++++++++++-----------
>  src/conf/nwfilter_params.h             | 23 ++++++++-----------
>  src/nwfilter/nwfilter_dhcpsnoop.c      |  6 ++---
>  src/nwfilter/nwfilter_dhcpsnoop.h      |  2 +-
>  src/nwfilter/nwfilter_gentech_driver.c | 42 +++++++++++++++++-----------------
>  src/nwfilter/nwfilter_gentech_driver.h |  4 ++--
>  src/nwfilter/nwfilter_learnipaddr.c    |  6 ++---
>  src/nwfilter/nwfilter_learnipaddr.h    |  4 ++--
>  src/nwfilter/nwfilter_tech_driver.h    |  2 +-
>  tests/nwfilterxml2firewalltest.c       | 24 +++++++++----------
>  14 files changed, 72 insertions(+), 75 deletions(-)
...
> diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
> index d23cad3b75..aec68ab847 100644
> --- a/src/nwfilter/nwfilter_dhcpsnoop.c
> +++ b/src/nwfilter/nwfilter_dhcpsnoop.c
> @@ -141,7 +141,7 @@ struct _virNWFilterSnoopReq {
>      char                                 ifkey[VIR_IFKEY_LEN];
>      virMacAddr                           macaddr;
>      char                                *filtername;
> -    virNWFilterHashTablePtr              vars;
> +    virHashTablePtr              vars;

One space between virHashTablePtr and vars would be enough. Or fix the
alignment if you want to keep it consistently aligned.

>      virNWFilterDriverStatePtr            driver;
>      /* start and end of lease list, ordered by lease time */
>      virNWFilterSnoopIPLeasePtr           start;
...
> diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter_gentech_driver.h
> index 71924879a2..67092157b8 100644
> --- a/src/nwfilter/nwfilter_gentech_driver.h
> +++ b/src/nwfilter/nwfilter_gentech_driver.h
> @@ -53,11 +53,11 @@ int virNWFilterInstantiateFilterLate(virNWFilterDriverStatePtr driver,
>                                       const char *linkdev,
>                                       const virMacAddr *macaddr,
>                                       const char *filtername,
> -                                     virNWFilterHashTablePtr filterparams);
> +                                     virHashTablePtr filterparams);
>  
>  int virNWFilterTeardownFilter(const virDomainNetDef *net);
>  
> -virNWFilterHashTablePtr virNWFilterCreateVarHashmap(char *macaddr,
> +virHashTablePtr virNWFilterCreateVarHashmap(char *macaddr,
>                                         const virNWFilterVarValue *value);

The indentation could be updated here as well.

>  
>  int virNWFilterDomainFWUpdateCB(virDomainObjPtr vm,
...

Reviewed-by: Jiri Denemark <jdenemar at redhat.com>