linux-man.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Michael Kerrisk (man-pages)" <mtk.manpages-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: Carlos O'Donell <carlos-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>,
	"linux-man-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
	<linux-man-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Cc: mtk.manpages-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Subject: Re: [patch 3/7] getspnam.3: wfix
Date: Fri, 16 Jan 2015 06:59:44 +0100	[thread overview]
Message-ID: <54B8A8D0.70404@gmail.com> (raw)
In-Reply-To: <54B882FD.9090009-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

On 01/16/2015 04:18 AM, Carlos O'Donell wrote:
> Harmonize all the manual pages to use "stream" for FILE*
> instead of randomly using "fp" or "stream." Choosing something
> and being consistent helps users scan the man pages quickly
> and understand what they are looking at.

Thanks, Carlos. Applied.

Cheers,

Michael



> Patch against master.
> 
> diff --git a/man3/getspnam.3 b/man3/getspnam.3
> index 13d6157..e230b78 100644
> --- a/man3/getspnam.3
> +++ b/man3/getspnam.3
> @@ -24,11 +24,11 @@ lckpwdf, ulckpwdf \- get shadow password file entry
>  .sp
>  .B void endspent(void);
>  .sp
> -.BI "struct spwd *fgetspent(FILE *" fp );
> +.BI "struct spwd *fgetspent(FILE *" stream );
>  .sp
>  .BI "struct spwd *sgetspent(const char *" s );
>  .sp
> -.BI "int putspent(const struct spwd *" p ", FILE *" fp );
> +.BI "int putspent(const struct spwd *" p ", FILE *" stream );
>  .sp
>  .B int lckpwdf(void);
>  .sp
> @@ -46,7 +46,7 @@ lckpwdf, ulckpwdf \- get shadow password file entry
>  .br
>  .BI "        char *" buf ", size_t " buflen ", struct spwd **" spbufp );
>  .sp
> -.BI "int fgetspent_r(FILE *" fp ", struct spwd *" spbuf ,
> +.BI "int fgetspent_r(FILE *" stream ", struct spwd *" spbuf ,
>  .br
>  .BI "        char *" buf ", size_t " buflen ", struct spwd **" spbufp );
>  .sp
> @@ -137,8 +137,8 @@ The
>  function writes the contents of the supplied struct
>  .I spwd
>  .I *p
> -as a text line in the shadow password file format to the stream
> -.IR fp .
> +as a text line in the shadow password file format to the
> +.IR stream .
>  String entries with value NULL and numerical entries with value \-1
>  are written as an empty string.
>  .LP
> ---
> 
> Cheers,
> Carlos.
> 


-- 
Michael Kerrisk
Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/
Linux/UNIX System Programming Training: http://man7.org/training/
--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

      parent reply	other threads:[~2015-01-16  5:59 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-16  3:18 [patch 3/7] getspnam.3: wfix Carlos O'Donell
     [not found] ` <54B882FD.9090009-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2015-01-16  5:59   ` Michael Kerrisk (man-pages) [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=54B8A8D0.70404@gmail.com \
    --to=mtk.manpages-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
    --cc=carlos-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
    --cc=linux-man-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).