[Nut-upsdev] [PATCH 36/36] whitespace fixes suggested by "git diff --check" on my local branch.

Arnaud Quette aquette.dev at gmail.com
Wed May 16 11:04:37 UTC 2012


2012/3/9 Greg A. Woods <woods at planix.com>:
> From: "Greg A. Woods" <woods at planix.com>
>
> ---
>  clients/status.h      |    2 +-
>  docs/FAQ.txt          |    2 +-
>  docs/config-notes.txt |    2 +-
>  docs/man/upsmon.txt   |    2 +-
>  drivers/dummy-ups.h   |    4 ++--
>  5 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/clients/status.h b/clients/status.h
> index ba70661..bb80905 100644
> --- a/clients/status.h
> +++ b/clients/status.h
> @@ -21,7 +21,7 @@
>  * This maps ups.status values to meaningful names and severity values, both of
>  * which are currently only used by upsstats.
>  *
> - * XXX why the heck isn't FSD here!?!?!?
> + * XXX why the heck isn't FSD here!?!?!?
>  */
>
>  struct {
> diff --git a/docs/FAQ.txt b/docs/FAQ.txt
> index c1f594c..c62e730 100644
> --- a/docs/FAQ.txt
> +++ b/docs/FAQ.txt
> @@ -751,7 +751,7 @@ Implement this by modifying your shutdown script like this:
>                        # power supplies if possible (normally possible
>                        # on most modern systems)
>
> -                       halt -p
> +                       halt -p
>                fi
>
>                # if your system cannot power itself off at this point
> diff --git a/docs/config-notes.txt b/docs/config-notes.txt
> index 070b3d6..da7133b 100644
> --- a/docs/config-notes.txt
> +++ b/docs/config-notes.txt
> @@ -250,7 +250,7 @@ You should see just one line in response:
>        OL
>
>  OL means your system is running on line power.  If it says something
> -else (like OB - on battery, or LB - low battery, or DYING - imminent failure), your driver was
> +else (like OB - on battery, or LB - low battery, or DYING - imminent failure), your driver was
>  probably misconfigured during the <<Driver_configuration, Driver configuration>>
>  step.  If you reconfigure the driver, use 'upsdrvctl stop' to stop it, then
>  start it again as shown in the <<Starting_drivers, Starting driver(s)>> step.
> diff --git a/docs/man/upsmon.txt b/docs/man/upsmon.txt
> index 96d0c99..6cd36f1 100644
> --- a/docs/man/upsmon.txt
> +++ b/docs/man/upsmon.txt
> @@ -25,7 +25,7 @@ power events.
>
>  upsmon can monitor multiple systems using a single process.  Every UPS
>  that is defined in the linkman:upsmon.conf[5] configuration file is assigned
> -a power value and a type (*slave* or *master*).
> +a power value and a type (*slave* or *master*).
>
>  OPTIONS
>  -------
> diff --git a/drivers/dummy-ups.h b/drivers/dummy-ups.h
> index 5b2706b..7e79679 100644
> --- a/drivers/dummy-ups.h
> +++ b/drivers/dummy-ups.h
> @@ -43,7 +43,7 @@
>
>  #if 0  /* XXX status lookup table not currently used???? */
>  /*
> - * Status lookup table type definition
> + * Status lookup table type definition
>  */
>  typedef struct {
>        const char      *status_str;    /* ups.status string */
> @@ -63,7 +63,7 @@ typedef struct {
>  #define STATUS_CHRG            (1 << 10)       /* charging */
>  #define STATUS_DISCHRG         (1 << 11)       /* discharging */
>  #define STATUS_DYING           (1 << 12)       /* imminent death predicted */
> -
> +
>  /*
>  * Status lookup table
>  */

partially applied to trunk, r3602:
- the 3 first do not apply, since they require some other patches to
be already applied (refer to my previous answer for rationales),
- the remainders have been applied.

thanks,
Arnaud
-- 
Linux / Unix Expert R&D - Eaton - http://powerquality.eaton.com
Network UPS Tools (NUT) Project Leader - http://www.networkupstools.org/
Debian Developer - http://www.debian.org
Free Software Developer - http://arnaud.quette.free.fr/



More information about the Nut-upsdev mailing list