[PATCH] run-command: mark file-local symbols static

[PATCH] run-command: mark file-local symbols static

[Ramsay Jones]

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---

Hi Jeff,

If you need to re-roll your 'jk/gpg-interface-cleanup' branch, could
you please squash this into the relevant patch (commit 74287e34,
"run-command: add pipe_command helper", 16-06-2016).

BTW, also on that branch, commit 6fec0a89 ("verify_signed_buffer: use
tempfile object", 16-06-2016) removes the last use of the git_mkstemp()
function. Should it be removed?

Thanks!

ATB,
Ramsay Jones

 run-command.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/run-command.c b/run-command.c
index 609fa4c..33bc63a 100644
--- a/run-command.c
+++ b/run-command.c
@@ -886,7 +886,7 @@ struct io_pump {
 	struct pollfd *pfd;
 };
 
-int pump_io_round(struct io_pump *slots, int nr, struct pollfd *pfd)
+static int pump_io_round(struct io_pump *slots, int nr, struct pollfd *pfd)
 {
 	int pollsize = 0;
 	int i;
@@ -950,7 +950,7 @@ int pump_io_round(struct io_pump *slots, int nr, struct pollfd *pfd)
 	return 1;
 }
 
-int pump_io(struct io_pump *slots, int nr)
+static int pump_io(struct io_pump *slots, int nr)
 {
 	struct pollfd *pfd;
 	int i;
-- 
2.9.0

Re: [PATCH] run-command: mark file-local symbols static

[Jeff King]

On Fri, Jun 17, 2016 at 10:01:24PM +0100, Ramsay Jones wrote:

> If you need to re-roll your 'jk/gpg-interface-cleanup' branch, could
> you please squash this into the relevant patch (commit 74287e34,
> "run-command: add pipe_command helper", 16-06-2016).

Thanks, yes.

> BTW, also on that branch, commit 6fec0a89 ("verify_signed_buffer: use
> tempfile object", 16-06-2016) removes the last use of the git_mkstemp()
> function. Should it be removed?

I think so. We still have git_mkstemp_mode and friends, so in that sense
this is part of a family of commands that somebody might use again. But:

  1. Unlike the others in the family, where we implement mkstemp
     ourselves, this one uses the system mkstemp. Which probably behaves
     in totally the same way, but it's kind of weird and oddball.

  2. I think we should be steering people towards tempfile.c anyway, for
     its auto-cleanup properties.

Want to do a patch on top?

-Peff

Re: [PATCH] run-command: mark file-local symbols static

[Ramsay Jones]

On 18/06/16 00:33, Jeff King wrote:
> On Fri, Jun 17, 2016 at 10:01:24PM +0100, Ramsay Jones wrote:
> 
>> If you need to re-roll your 'jk/gpg-interface-cleanup' branch, could
>> you please squash this into the relevant patch (commit 74287e34,
>> "run-command: add pipe_command helper", 16-06-2016).
> 
> Thanks, yes.
> 
>> BTW, also on that branch, commit 6fec0a89 ("verify_signed_buffer: use
>> tempfile object", 16-06-2016) removes the last use of the git_mkstemp()
>> function. Should it be removed?
> 
> I think so. We still have git_mkstemp_mode and friends, so in that sense
> this is part of a family of commands that somebody might use again. But:
> 
>   1. Unlike the others in the family, where we implement mkstemp
>      ourselves, this one uses the system mkstemp. Which probably behaves
>      in totally the same way, but it's kind of weird and oddball.
> 
>   2. I think we should be steering people towards tempfile.c anyway, for
>      its auto-cleanup properties.
> 
> Want to do a patch on top?

OK, will do. (tomorrow, it is 2am here ...)

ATB,
Ramsay Jones