diff options
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/daemon.h | 6 | ||||
| -rw-r--r-- | daemon/guestfsd.c | 28 |
2 files changed, 17 insertions, 17 deletions
diff --git a/daemon/daemon.h b/daemon/daemon.h index bfdde9d3..89128402 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -55,13 +55,13 @@ extern void free_stringslen (char **argv, int len); #define COMMAND_FLAG_FOLD_STDOUT_ON_STDERR 1 extern int commandf (char **stdoutput, char **stderror, int flags, - const char *name, ...); + const char *name, ...); extern int commandrf (char **stdoutput, char **stderror, int flags, - const char *name, ...); + const char *name, ...); extern int commandvf (char **stdoutput, char **stderror, int flags, char const *const *argv); extern int commandrvf (char **stdoutput, char **stderror, int flags, - char const* const *argv); + char const* const *argv); extern char **split_lines (char *str); diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c index b6c3c448..d16826f0 100644 --- a/daemon/guestfsd.c +++ b/daemon/guestfsd.c @@ -641,7 +641,7 @@ commandvf (char **stdoutput, char **stderror, int flags, */ int commandrvf (char **stdoutput, char **stderror, int flags, - char const* const *argv) + char const* const *argv) { int so_size = 0, se_size = 0; int so_fd[2], se_fd[2]; @@ -746,19 +746,19 @@ commandrvf (char **stdoutput, char **stderror, int flags, if (r == 0) { FD_CLR (se_fd[0], &rset); quit++; } if (r > 0) { - if (verbose) - ignore_value (write (2, buf, r)); - - if (stderror) { - se_size += r; - p = realloc (*stderror, se_size); - if (p == NULL) { - perror ("realloc"); - goto quit; - } - *stderror = p; - memcpy (*stderror + se_size - r, buf, r); - } + if (verbose) + ignore_value (write (2, buf, r)); + + if (stderror) { + se_size += r; + p = realloc (*stderror, se_size); + if (p == NULL) { + perror ("realloc"); + goto quit; + } + *stderror = p; + memcpy (*stderror + se_size - r, buf, r); + } } } } |