From: Thomas Rast <trast@student.ethz.ch>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Sixt <j6t@kdbg.org>, Jeff King <peff@peff.net>,
Jannis Pohlmann <jannis.pohlmann@codethink.co.uk>,
<git@vger.kernel.org>
Subject: [PATCH v2 1/4] strbuf: improve strbuf_get*line documentation
Date: Thu, 23 Feb 2012 10:42:21 +0100 [thread overview]
Message-ID: <d5522f8d1154321804cb60fb4f53d538242ead88.1329988335.git.trast@student.ethz.ch> (raw)
In-Reply-To: <cover.1329988335.git.trast@student.ethz.ch>
strbuf_getline() was not documented very clearly, though a reader
familiar with getline() would not have had any questions about it.
strbuf_getwholeline() was not documented at all.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---
Documentation/technical/api-strbuf.txt | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/Documentation/technical/api-strbuf.txt b/Documentation/technical/api-strbuf.txt
index afe2759..cc6db5e 100644
--- a/Documentation/technical/api-strbuf.txt
+++ b/Documentation/technical/api-strbuf.txt
@@ -255,8 +255,16 @@ same behaviour as well.
`strbuf_getline`::
- Read a line from a FILE* pointer. The second argument specifies the line
- terminator character, typically `'\n'`.
+ Read a line from a FILE*. The second argument specifies the
+ line terminator character, typically `'\n'`. Reading stops
+ after the terminator or at EOF. The terminator is removed
+ from the buffer before returning. Returns 0 unless there was
+ nothing left before EOF, in which case it returns `EOF`.
+
+`strbuf_getwholeline`::
+
+ Like `strbuf_getline`, but keeps the trailing terminator (if
+ any) in the buffer.
`stripspace`::
--
1.7.9.1.430.g4998543
next prev parent reply other threads:[~2012-02-23 9:42 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-22 16:05 Problems with unrecognized headers in git bundles Jannis Pohlmann
2012-02-22 19:34 ` [PATCH 1/2] bundle: put strbuf_readline_fd in strbuf.c with adjustments Thomas Rast
2012-02-22 19:34 ` [PATCH 2/2] bundle: use a strbuf to scan the log for boundary commits Thomas Rast
2012-02-22 20:22 ` Junio C Hamano
2012-02-22 20:25 ` Thomas Rast
2012-02-22 20:50 ` Junio C Hamano
2012-02-22 21:00 ` Jeff King
2012-02-22 20:55 ` Jeff King
2012-02-22 22:10 ` Johannes Sixt
2012-02-23 3:20 ` Junio C Hamano
2012-02-23 3:38 ` Junio C Hamano
2012-02-23 9:42 ` [PATCH v2 0/4] Making an elephant out of a getline() bug Thomas Rast
2012-02-23 9:42 ` Thomas Rast [this message]
2012-02-23 10:08 ` [PATCH v2 1/4] strbuf: improve strbuf_get*line documentation Jeff King
2012-02-23 9:42 ` [PATCH v2 2/4] bundle: put strbuf_readline_fd in strbuf.c with adjustments Thomas Rast
2012-02-23 9:42 ` [PATCH v2 3/4] t5704: match tests to modern style Thomas Rast
2012-02-23 23:36 ` Junio C Hamano
2012-02-23 9:42 ` [PATCH v2 4/4] bundle: use a strbuf to scan the log for boundary commits Thomas Rast
2012-02-23 19:04 ` [PATCH v2 0/4] Making an elephant out of a getline() bug Junio C Hamano
2012-02-22 20:51 ` [PATCH 1/2] bundle: put strbuf_readline_fd in strbuf.c with adjustments Jeff King
2012-02-22 20:25 ` Problems with unrecognized headers in git bundles Øyvind A. Holm
2012-02-22 20:40 ` Øyvind A. Holm
2012-02-23 13:27 ` Erik Faye-Lund
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=d5522f8d1154321804cb60fb4f53d538242ead88.1329988335.git.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=jannis.pohlmann@codethink.co.uk \
--cc=peff@peff.net \
/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).