From: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
To: florian.achleitner.2.6.31@gmail.com
Cc: Junio C Hamano <gitster@pobox.com>,
GIT Mailing-list <git@vger.kernel.org>
Subject: [PATCH 1/3] remote-testsvn.c: Avoid the getline() GNU extension function
Date: Sat, 25 Aug 2012 18:13:23 +0100 [thread overview]
Message-ID: <503907B3.9040101@ramsay1.demon.co.uk> (raw)
The getline() function is a GNU extension (you need to define
_GNU_SOURCE before including stdio.h) and is, therefore, not
portable. In particular, getline() is not available on MinGW.
In order to support non-GNU systems, we replace the call to
getline() with (almost) equivalent code using strbuf_getline().
Note that, unlike getline(), strbuf_getline() removes the
newline terminator from the returned string. This difference
in semantics does not matter at this call-site. Also, we note
that the original code was leaking the memory allocated to
'line' by getline().
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
---
Hi Florian,
Could you please squash this into commit 0320cef0 ("remote-svn: add
marks-file regeneration", 22-08-2012).
ATB,
Ramsay Jones
remote-testsvn.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/remote-testsvn.c b/remote-testsvn.c
index 09dc304..d0b81d5 100644
--- a/remote-testsvn.c
+++ b/remote-testsvn.c
@@ -121,9 +121,8 @@ static void regenerate_marks(void)
static void check_or_regenerate_marks(int latestrev) {
FILE *marksfile;
- char *line = NULL;
- size_t linelen = 0;
struct strbuf sb = STRBUF_INIT;
+ struct strbuf line = STRBUF_INIT;
int found = 0;
if (latestrev < 1)
@@ -139,8 +138,8 @@ static void check_or_regenerate_marks(int latestrev) {
fclose(marksfile);
} else {
strbuf_addf(&sb, ":%d ", latestrev);
- while (getline(&line, &linelen, marksfile) != -1) {
- if (!prefixcmp(line, sb.buf)) {
+ while (strbuf_getline(&line, marksfile, '\n') != EOF) {
+ if (!prefixcmp(line.buf, sb.buf)) {
found++;
break;
}
@@ -151,6 +150,7 @@ static void check_or_regenerate_marks(int latestrev) {
}
free_notes(NULL);
strbuf_release(&sb);
+ strbuf_release(&line);
}
static int cmd_import(const char *line)
--
1.7.12
next reply other threads:[~2012-08-25 17:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-25 17:13 Ramsay Jones [this message]
2012-08-25 19:03 ` [PATCH 1/3] remote-testsvn.c: Avoid the getline() GNU extension function Joachim Schmitz
2012-08-25 19:20 ` Erik Faye-Lund
2012-08-26 17:31 ` Junio C Hamano
2012-08-30 17:25 ` Ramsay Jones
2012-08-30 17:19 ` Ramsay Jones
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=503907B3.9040101@ramsay1.demon.co.uk \
--to=ramsay@ramsay1.demon.co.uk \
--cc=florian.achleitner.2.6.31@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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