Re: [PATCH 11/12] hwclock: remove unused usage() FILE argument

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




On 06/21/2017 11:48 AM, J William Piggott wrote:
> 
> 
> On 06/21/2017 05:26 AM, Karel Zak wrote:
>> On Sun, Jun 18, 2017 at 08:49:49PM -0400, J William Piggott wrote:
>>>
>>> Signed-off-by: J William Piggott <elseifthen@xxxxxxx>
>>> ---
>>>  sys-utils/hwclock.c | 74 ++++++++++++++++++++++++++---------------------------
>>>  1 file changed, 37 insertions(+), 37 deletions(-)
>>>
>>> diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
>>> index 7d69b7a..636d36a 100644
>>> --- a/sys-utils/hwclock.c
>>> +++ b/sys-utils/hwclock.c
>>> @@ -1200,49 +1200,49 @@ static void out_version(void)
>>>  }
>>>  
>>>  static void __attribute__((__noreturn__))
>>> -usage(const struct hwclock_control *ctl, FILE *out)
>>> +usage(const struct hwclock_control *ctl)
>>>  {
>>> -	fputs(USAGE_HEADER, out);
>>> -	fputs(_(" hwclock [function] [option...]\n"), out);
>>> -
>>> -	fputs(USAGE_SEPARATOR, out);
>>> -	fputs(_(" Query or set the RTC (Real Time Clock / Hardware Clock)\n"), out);
>>> -
>>> -	fputs(USAGE_FUNCTIONS, out);
>>> -	fputs(_(" -r, --show           display the RTC time\n"), out);
>>> -	fputs(_("     --get            display drift corrected RTC time\n"), out);
>>> -	fputs(_("     --set            set the RTC according to --date\n"), out);
>>> -	fputs(_(" -s, --hctosys        set the system time from the RTC\n"), out);
>>> -	fputs(_(" -w, --systohc        set the RTC from the system time\n"), out);
>>> -	fputs(_("     --systz          send timescale configurations to the kernel\n"), out);
>>> -	fputs(_("     --adjust         adjust the RTC to account for systematic drift\n"), out);
>>> +	fputs(USAGE_HEADER, stdout);
>>> +	puts(_(" hwclock [function] [option...]"));
>>> +
>>> +	fputs(USAGE_SEPARATOR, stdout);
>>> +	puts(_(" Query or set the RTC (Real Time Clock / Hardware Clock)"));
>>             ^
>> We don't use this space here. Fixed.
> 
> Ah, I miss read this in howto-usage-function.txt:
> 
>> The usage output begins with an empty line, followed by 'Usage:', and
>> then the synopsis on the line after that.  The synopsis and option-
>> description lines are all indented by one space (0x40).
> 
> I read 'synopsis and description', not 'option-description'. Also, it's
> the entire option line, not the option-description that is indented. 
> 
> There is not an example in boilerplate.c for a command description,
> there probably should be.

My memory failed me on this one. There is an example in both docs; it
just wasn't mentioned in the text of howto-usage-function.txt. I will
submit a patch for that and to clarify the indentations.

> 
>>
>>     Karel
>>
> --
> To unsubscribe from this list: send the line "unsubscribe util-linux" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux