From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, jrnieder@gmail.com, pclouds@gmail.com,
Jens.Lehmann@web.de, peff@peff.net, sunshine@sunshineco.com,
Stefan Beller <sbeller@google.com>
Subject: [PATCHv21 06/10] run_processes_parallel: rename parameters for the callbacks
Date: Mon, 29 Feb 2016 18:07:16 -0800 [thread overview]
Message-ID: <1456798040-30129-7-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1456798040-30129-1-git-send-email-sbeller@google.com>
The refs code has a similar pattern of passing around 'struct strbuf *err',
which is strictly used for error reporting. This is not the case here,
as the strbuf is used to accumulate all the output (whether it is error
or not) for the user. Rename it to 'out'.
Suggested-by: Jonathan Nieder <jrnieder@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
---
run-command.c | 4 ++--
run-command.h | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/run-command.c b/run-command.c
index bdda940..62c6721 100644
--- a/run-command.c
+++ b/run-command.c
@@ -902,7 +902,7 @@ struct parallel_processes {
struct strbuf buffered_output; /* of finished children */
};
-static int default_start_failure(struct strbuf *err,
+static int default_start_failure(struct strbuf *out,
void *pp_cb,
void *pp_task_cb)
{
@@ -910,7 +910,7 @@ static int default_start_failure(struct strbuf *err,
}
static int default_task_finished(int result,
- struct strbuf *err,
+ struct strbuf *out,
void *pp_cb,
void *pp_task_cb)
{
diff --git a/run-command.h b/run-command.h
index 05dec41..05cde5f 100644
--- a/run-command.h
+++ b/run-command.h
@@ -139,7 +139,7 @@ int in_async(void);
* return the negative signal number.
*/
typedef int (*get_next_task_fn)(struct child_process *cp,
- struct strbuf *err,
+ struct strbuf *out,
void *pp_cb,
void **pp_task_cb);
@@ -148,7 +148,7 @@ typedef int (*get_next_task_fn)(struct child_process *cp,
* a new process.
*
* You must not write to stdout or stderr in this function. Add your
- * message to the strbuf err instead, which will be printed without
+ * message to the strbuf out instead, which will be printed without
* messing up the output of the other parallel processes.
*
* pp_cb is the callback cookie as passed into run_processes_parallel,
@@ -158,7 +158,7 @@ typedef int (*get_next_task_fn)(struct child_process *cp,
* To send a signal to other child processes for abortion, return
* the negative signal number.
*/
-typedef int (*start_failure_fn)(struct strbuf *err,
+typedef int (*start_failure_fn)(struct strbuf *out,
void *pp_cb,
void *pp_task_cb);
@@ -166,7 +166,7 @@ typedef int (*start_failure_fn)(struct strbuf *err,
* This callback is called on every child process that finished processing.
*
* You must not write to stdout or stderr in this function. Add your
- * message to the strbuf err instead, which will be printed without
+ * message to the strbuf out instead, which will be printed without
* messing up the output of the other parallel processes.
*
* pp_cb is the callback cookie as passed into run_processes_parallel,
@@ -177,7 +177,7 @@ typedef int (*start_failure_fn)(struct strbuf *err,
* the negative signal number.
*/
typedef int (*task_finished_fn)(int result,
- struct strbuf *err,
+ struct strbuf *out,
void *pp_cb,
void *pp_task_cb);
--
2.8.0.rc0.1.g68b4e3f
next prev parent reply other threads:[~2016-03-01 2:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-01 2:07 [PATCHv21 00/10] Expose submodule parallelism to the user Stefan Beller
2016-03-01 2:07 ` [PATCHv21 01/10] submodule-config: keep update strategy around Stefan Beller
2016-03-01 2:07 ` [PATCHv21 02/10] submodule-config: drop check against NULL Stefan Beller
2016-03-01 2:07 ` [PATCHv21 03/10] fetching submodules: respect `submodule.fetchJobs` config option Stefan Beller
2016-03-01 2:07 ` [PATCHv21 04/10] submodule update: direct error message to stderr Stefan Beller
2016-03-01 2:07 ` [PATCHv21 05/10] run_processes_parallel: treat output of children as byte array Stefan Beller
2016-03-01 2:07 ` Stefan Beller [this message]
2016-03-01 2:07 ` [PATCHv21 07/10] git submodule update: have a dedicated helper for cloning Stefan Beller
2016-03-01 2:07 ` [PATCHv21 08/10] submodule helper: remove double 'fatal: ' prefix Stefan Beller
2016-03-01 2:07 ` [PATCHv21 09/10] submodule update: expose parallelism to the user Stefan Beller
2016-03-01 2:07 ` [PATCHv21 10/10] clone: allow an explicit argument for parallel submodule clones Stefan Beller
2016-03-01 22:36 ` [PATCHv21 00/10] Expose submodule parallelism to the user Junio C Hamano
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=1456798040-30129-7-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.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;
as well as URLs for NNTP newsgroup(s).