diff options
| author | charnier <charnier@FreeBSD.org> | 2003-09-07 15:50:43 +0000 |
|---|---|---|
| committer | charnier <charnier@FreeBSD.org> | 2003-09-07 15:50:43 +0000 |
| commit | 45cdaa95450b2998d946dcc89c5b24bce027261b (patch) | |
| tree | 9601ea58898cfaa89503da5cf64e071e11d38726 /usr.bin/truss | |
| parent | 31157a0435031625a4db1f648dc36b234edf8497 (diff) | |
| download | FreeBSD-src-45cdaa95450b2998d946dcc89c5b24bce027261b.zip FreeBSD-src-45cdaa95450b2998d946dcc89c5b24bce027261b.tar.gz | |
Add FBSDID. Do not \n terminate warnx() argument. fprint() -> warnx().
Diffstat (limited to 'usr.bin/truss')
| -rw-r--r-- | usr.bin/truss/main.c | 8 | ||||
| -rw-r--r-- | usr.bin/truss/setup.c | 9 |
2 files changed, 6 insertions, 11 deletions
diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c index 18d46b6..0a6cdb5 100644 --- a/usr.bin/truss/main.c +++ b/usr.bin/truss/main.c @@ -29,10 +29,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * The main module for truss. Suprisingly simple, but, then, the other @@ -129,7 +127,7 @@ set_etype(struct trussinfo *trussinfo) { if (funcs->type == NULL) { funcs = &ex_types[0]; - warn("Execution type %s is not supported -- using %s\n", + warn("execution type %s is not supported -- using %s", progt, funcs->type); } return funcs; diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c index aedd957..2d252a7 100644 --- a/usr.bin/truss/setup.c +++ b/usr.bin/truss/setup.c @@ -29,10 +29,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * Various setup functions for truss. Not the cleanest-written code, @@ -45,7 +43,6 @@ static const char rcsid[] = #include <sys/wait.h> #include <err.h> -#include <errno.h> #include <fcntl.h> #include <signal.h> #include <stdio.h> @@ -115,7 +112,7 @@ setup_and_wait(char *command[]) { if (ioctl(fd, PIOCWAIT, &pfs) == -1) err(6, "PIOCWAIT"); if (pfs.why == S_EXIT) { - fprintf(stderr, "process exited before exec'ing\n"); + warnx("process exited before exec'ing"); ioctl(fd, PIOCCONT, 0); wait(0); exit(7); |
