Skip to content

Commit 2294ddf

Browse files
bgilbertcperciva
authored andcommitted
Fix concatenated words in error messages
Also drop a redundant newline.
1 parent df29760 commit 2294ddf

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

tar/bsdtar.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,7 +1333,7 @@ main(int argc, char **argv)
13331333
bsdtar->return_value = 2;
13341334
bsdtar_warnc(bsdtar, 0,
13351335
"Data on server was modified, but it might not"
1336-
"be exactly what you requested");
1336+
" be exactly what you requested");
13371337
}
13381338
}
13391339
return (bsdtar->return_value);
@@ -1942,7 +1942,7 @@ dooption(struct bsdtar *bsdtar, const char * conf_opt,
19421942
if (passphrase_entry_parse(conf_arg,
19431943
&bsdtar->option_passphrase_entry, &str))
19441944
bsdtar_errc(bsdtar, 1, 0, "Cannot parse passphrase"
1945-
"entry method: %s", conf_arg);
1945+
" entry method: %s", conf_arg);
19461946
if ((bsdtar->option_passphrase_arg = strdup(str)) == NULL)
19471947
bsdtar_errc(bsdtar, 1, ENOMEM,
19481948
"Cannot allocate memory");

tar/util.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ do_chdir(struct bsdtar *bsdtar)
467467
return;
468468

469469
if (chdir(bsdtar->pending_chdir) != 0) {
470-
bsdtar_errc(bsdtar, 1, 0, "could not chdir to '%s'\n",
470+
bsdtar_errc(bsdtar, 1, 0, "could not chdir to '%s'",
471471
bsdtar->pending_chdir);
472472
}
473473
free(bsdtar->pending_chdir);

0 commit comments

Comments
 (0)