diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2014-12-26 15:08:39 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2014-12-26 15:08:39 +0000 |
| commit | 16cde6d9844c2f8b23c3ec19745130a036c6f410 (patch) | |
| tree | 05f7e148b5c75addfee0ae734933b6d67530ae60 | |
| parent | af9034a8036f884fc06874c445d85ac9f416f4fe (diff) | |
| parent | a5261312fc4eed6b5595eca994c6cfec602829cd (diff) | |
| download | illumos-joyent-16cde6d9844c2f8b23c3ec19745130a036c6f410.tar.gz | |
[illumos-gate merge]
commit a5261312fc4eed6b5595eca994c6cfec602829cd
5473 typo in mbsrtowcs.3c
commit fd64a0d03455fdb3bbf710e77f2a2f6d08d3cf6c
3244 utmpd.c: fix uninitialized variable, ret_val and other gcc warnings
| -rw-r--r-- | usr/src/cmd/utmpd/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/cmd/utmpd/utmpd.c | 15 | ||||
| -rw-r--r-- | usr/src/man/man3c/mbsrtowcs.3c | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/usr/src/cmd/utmpd/Makefile b/usr/src/cmd/utmpd/Makefile index f1b2a4222e..611c1f36dd 100644 --- a/usr/src/cmd/utmpd/Makefile +++ b/usr/src/cmd/utmpd/Makefile @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# +# Copyright 2014 Shruti V Sampat <shrutisampat@gmail.com> # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -34,8 +34,6 @@ ROOTMANIFESTDIR = $(ROOTSVCSYSTEM) FILEMODE = 555 -CERRWARN += -_gcc=-Wno-extra - .KEEP_STATE: all: $(PROG) diff --git a/usr/src/cmd/utmpd/utmpd.c b/usr/src/cmd/utmpd/utmpd.c index fde5d01f93..ba23b04aa5 100644 --- a/usr/src/cmd/utmpd/utmpd.c +++ b/usr/src/cmd/utmpd/utmpd.c @@ -19,6 +19,10 @@ * CDDL HEADER END */ /* + * Copyright 2014 Shruti V Sampat <shrutisampat@gmail.com> + */ + +/* * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -177,8 +181,7 @@ static void warn_utmp(void); */ int -main(argc, argv) - char **argv; +main(int argc, char *argv[]) { char *defp; struct rlimit rlim; @@ -189,7 +192,7 @@ main(argc, argv) if (getuid() != 0) { (void) fprintf(stderr, - "You must be root to run this program\n"); + "You must be root to run this program\n"); fatal("You must be root to run this program"); } @@ -199,9 +202,9 @@ main(argc, argv) Debug = 1; } else { (void) fprintf(stderr, - "%s: Wrong number of arguments\n", prog_name); + "%s: Wrong number of arguments\n", prog_name); (void) fprintf(stderr, - "Usage: %s [-debug]\n", prog_name); + "Usage: %s [-debug]\n", prog_name); exit(2); } } @@ -349,7 +352,7 @@ wait_for_pids() register struct pollfd *pfd; register int i; pid_t pid; - int ret_val; + int ret_val = 0; int timeout; static time_t last_timeout = 0; static int bad_error = 0; /* Count of POLL errors */ diff --git a/usr/src/man/man3c/mbsrtowcs.3c b/usr/src/man/man3c/mbsrtowcs.3c index f53f871343..dd3001908c 100644 --- a/usr/src/man/man3c/mbsrtowcs.3c +++ b/usr/src/man/man3c/mbsrtowcs.3c @@ -10,7 +10,7 @@ .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] .TH MBSRTOWCS 3C "Jun 28, 2014" .SH NAME -mbsnrtwocs, mbsnrtowcs_l, mbsrtowcs, mbsrtowcs_l \- convert a character string +mbsnrtowcs, mbsnrtowcs_l, mbsrtowcs, mbsrtowcs_l \- convert a character string to a wide-character string (restartable) .SH SYNOPSIS .LP |