diff options
| author | Robert Mustacchi <rm@joyent.com> | 2019-01-29 04:36:27 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2019-02-06 16:03:48 +0000 |
| commit | 2bd653815361427c17538380a0ae62a9a27120ff (patch) | |
| tree | 9de0da0f1bc6217ef3602246c684231eae36c464 /usr/src/cmd/ctfmerge/ctfmerge.c | |
| parent | 908c640f41dd286bcc16fcf143d12430fb69895f (diff) | |
| download | illumos-joyent-2bd653815361427c17538380a0ae62a9a27120ff.tar.gz | |
OS-7549 Sync CTF review changes back
Reviewed by: John Levon <john.levon@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Approved by: John Levon <john.levon@joyent.com>
Diffstat (limited to 'usr/src/cmd/ctfmerge/ctfmerge.c')
| -rw-r--r-- | usr/src/cmd/ctfmerge/ctfmerge.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/usr/src/cmd/ctfmerge/ctfmerge.c b/usr/src/cmd/ctfmerge/ctfmerge.c index a05d6aab9b..1257fd16c9 100644 --- a/usr/src/cmd/ctfmerge/ctfmerge.c +++ b/usr/src/cmd/ctfmerge/ctfmerge.c @@ -107,7 +107,7 @@ ctfmerge_expect_ctf(const char *name, Elf *elf) size_t len; if (gelf_getsym(data, i, &sym) == NULL) - ctfmerge_fatal("failed to read symbol table entry %d " + ctfmerge_fatal("failed to read symbol table entry %lu " "for %s: %s\n", i, name, elf_errmsg(elf_errno())); if (GELF_ST_TYPE(sym.st_info) != STT_FILE) @@ -300,11 +300,10 @@ ctfmerge_usage(const char *fmt, ...) va_end(ap); } - (void) fprintf(stderr, "Usage: %s [-gt] [-d uniqfile] [-l label] " + (void) fprintf(stderr, "Usage: %s [-t] [-d uniqfile] [-l label] " "[-L labelenv] [-j nthrs] -o outfile file ...\n" "\n" "\t-d uniquify merged output against uniqfile\n" - "\t-g do not remove source debug information (STABS, DWARF)\n" "\t-j use nthrs threads to perform the merge\n" "\t-l set output container's label to specified value\n" "\t-L set output container's label to value from environment\n" @@ -370,8 +369,7 @@ main(int argc, char *argv[]) errno = 0; argj = strtol(optarg, &eptr, 10); if (errno != 0 || argj == LONG_MAX || - argj == LONG_MIN || argj <= 0 || - argj > UINT_MAX || *eptr != '\0') { + argj > 1024 || *eptr != '\0') { ctfmerge_fatal("invalid argument for -j: %s\n", optarg); } @@ -428,7 +426,7 @@ main(int argc, char *argv[]) ctf_errmsg(err)); if ((err = ctf_merge_set_nthreads(cmh, nthreads)) != 0) - ctfmerge_fatal("failed to set parallelism to %d: %s\n", + ctfmerge_fatal("failed to set parallelism to %u: %s\n", nthreads, ctf_errmsg(err)); for (i = 0; i < argc; i++) { |