remote-testsvn: use internal argv_array of struct child_process in cmd_import()
Use the existing argv_array member instead of providing our own. This way we don't have to initialize or clean it up explicitly. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
Jul 18, 2014 at 17:20 UTC
1cefa143250ad8c60e2a3db6c18278f7bed508f5
1 file changed
+7
-9
remote-testsvn.c
+7
-9
@@ -175,8 +175,8 @@ static int cmd_import(const char *line)
175
char *note_msg;
176
unsigned char head_sha1[20];
177
unsigned int startrev;
178
- struct argv_array svndump_argv = ARGV_ARRAY_INIT;
178
struct child_process svndump_proc;
179
+ const char *command = "svnrdump";
180
181
if (read_ref(private_ref, head_sha1))
182
startrev = 0;
@@ -202,15 +202,14 @@ static int cmd_import(const char *line)
202
} else {
203
memset(&svndump_proc, 0, sizeof(struct child_process));
204
svndump_proc.out = -1;
205
- argv_array_push(&svndump_argv, "svnrdump");
206
- argv_array_push(&svndump_argv, "dump");
207
- argv_array_push(&svndump_argv, url);
208
- argv_array_pushf(&svndump_argv, "-r%u:HEAD", startrev);
209
- svndump_proc.argv = svndump_argv.argv;
205
+ argv_array_push(&svndump_proc.args, command);
206
+ argv_array_push(&svndump_proc.args, "dump");
207
+ argv_array_push(&svndump_proc.args, url);
208
+ argv_array_pushf(&svndump_proc.args, "-r%u:HEAD", startrev);
209
210
code = start_command(&svndump_proc);
211
if (code)
213
- die("Unable to start %s, code %d", svndump_proc.argv[0], code);
212
+ die("Unable to start %s, code %d", command, code);
213
dumpin_fd = svndump_proc.out;
214
}
215
/* setup marks file import/export */
@@ -226,8 +225,7 @@ static int cmd_import(const char *line)
225
if (!dump_from_file) {
226
code = finish_command(&svndump_proc);
227
if (code)
229
- warning("%s, returned %d", svndump_proc.argv[0], code);
230
- argv_array_clear(&svndump_argv);
228
+ warning("%s, returned %d", command, code);
229
}
230
231
return 0;