[libvirt] [PATCH 05/11] xm: Clean up

[Osier Yang]

On 2013年01月31日 02:51, John Ferlan wrote:
> Clean up some function headers.
> ---
>   src/xen/xm_internal.c | 119 +++++++++++++++++++++++++++++++-------------------
>   1 file changed, 75 insertions(+), 44 deletions(-)
>
> diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
> index 1c1db54..912de3f 100644
> --- a/src/xen/xm_internal.c
> +++ b/src/xen/xm_internal.c
> @@ -1,7 +1,7 @@
>   /*
>    * xm_internal.h: helper routines for dealing with inactive domains
>    *
> - * Copyright (C) 2006-2007, 2009-2012 Red Hat, Inc.
> + * Copyright (C) 2006-2007, 2009-2013 Red Hat, Inc.
>    * Copyright (C) 2006 Daniel P. Berrange
>    *
>    * This library is free software; you can redistribute it and/or
> @@ -124,7 +124,10 @@ struct xenXMConfigReaperData {
>   };
>
>   /* Remove any configs which were not refreshed recently */
> -static int xenXMConfigReaper(const void *payload, const void *key ATTRIBUTE_UNUSED, const void *data) {
> +static int
> +xenXMConfigReaper(const void *payload, const void *key ATTRIBUTE_UNUSED,
> +                  const void *data)
> +{
>       const struct xenXMConfigReaperData *args = data;
>       xenXMConfCachePtr entry = (xenXMConfCachePtr)payload;
>
> @@ -143,7 +146,8 @@ static int xenXMConfigReaper(const void *payload, const void *key ATTRIBUTE_UNUS
>
>
>   static virDomainDefPtr
> -xenXMConfigReadFile(virConnectPtr conn, const char *filename) {
> +xenXMConfigReadFile(virConnectPtr conn, const char *filename)
> +{
>       virConfPtr conf;
>       virDomainDefPtr def;
>       xenUnifiedPrivatePtr priv = conn->privateData;
> @@ -158,7 +162,9 @@ xenXMConfigReadFile(virConnectPtr conn, const char *filename) {
>   }
>
>   static int
> -xenXMConfigSaveFile(virConnectPtr conn, const char *filename, virDomainDefPtr def) {
> +xenXMConfigSaveFile(virConnectPtr conn, const char *filename,
> +                    virDomainDefPtr def)
> +{
>       virConfPtr conf;
>       xenUnifiedPrivatePtr priv = conn->privateData;
>       int ret;
> @@ -177,8 +183,7 @@ xenXMConfigSaveFile(virConnectPtr conn, const char *filename, virDomainDefPtr de
>    * calling this function
>    */
>   int
> -xenXMConfigCacheRemoveFile(virConnectPtr conn,
> -                           const char *filename)
> +xenXMConfigCacheRemoveFile(virConnectPtr conn, const char *filename)
>   {
>       xenUnifiedPrivatePtr priv = conn->privateData;
>       xenXMConfCachePtr entry;
> @@ -309,7 +314,9 @@ xenXMConfigCacheAddFile(virConnectPtr conn, const char *filename)
>    * Caller must hold the lock on 'conn->privateData' before
>    * calling this function
>    */
> -int xenXMConfigCacheRefresh(virConnectPtr conn) {
> +int
> +xenXMConfigCacheRefresh(virConnectPtr conn)
> +{
>       xenUnifiedPrivatePtr priv = conn->privateData;
>       DIR *dh;
>       struct dirent *ent;
> @@ -411,8 +418,7 @@ int xenXMConfigCacheRefresh(virConnectPtr conn) {
>    * every few seconds
>    */
>   virDrvOpenStatus
> -xenXMOpen(virConnectPtr conn,
> -          virConnectAuthPtr auth ATTRIBUTE_UNUSED,
> +xenXMOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED,
>             unsigned int flags)
>   {
>       xenUnifiedPrivatePtr priv = conn->privateData;
> @@ -442,7 +448,9 @@ xenXMOpen(virConnectPtr conn,
>    * Free the cached config files associated with this
>    * connection
>    */
> -int xenXMClose(virConnectPtr conn) {
> +int
> +xenXMClose(virConnectPtr conn)
> +{
>       xenUnifiedPrivatePtr priv = conn->privateData;
>
>       virHashFree(priv->nameConfigMap);
> @@ -455,9 +463,7 @@ int xenXMClose(virConnectPtr conn) {
>    * Since these are all offline domains, the state is always SHUTOFF.
>    */
>   int
> -xenXMDomainGetState(virDomainPtr domain,
> -                    int *state,
> -                    int *reason,
> +xenXMDomainGetState(virDomainPtr domain, int *state, int *reason,
>                       unsigned int flags)

Again, not sure if I like this. All others except things like these
are all good.