summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/cmd/calendar/calprog.c41
-rw-r--r--usr/src/cmd/diff/diff.c5
-rw-r--r--usr/src/cmd/diff/diffh.c9
-rw-r--r--usr/src/cmd/logadm/conf.c13
-rw-r--r--usr/src/cmd/logadm/opts.c15
-rw-r--r--usr/src/cmd/logger/logger.c10
-rw-r--r--usr/src/cmd/more/more.c7
-rw-r--r--usr/src/cmd/syslogd/syslogd.c2
8 files changed, 53 insertions, 49 deletions
diff --git a/usr/src/cmd/calendar/calprog.c b/usr/src/cmd/calendar/calprog.c
index a117f7a47f..7fadc9204c 100644
--- a/usr/src/cmd/calendar/calprog.c
+++ b/usr/src/cmd/calendar/calprog.c
@@ -20,7 +20,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -84,11 +84,12 @@ char *month[] = {
"[Dd]ec"
};
+static void read_tmpl(void);
static void error(const char *fmt, ...);
+static void generate(char *);
-static
-tprint(t)
-time_t t;
+static void
+tprint(time_t t)
{
struct tm *tm;
tm = localtime(&t);
@@ -97,7 +98,8 @@ time_t t;
month[tm->tm_mon], tm->tm_mon + 1, tm->tm_mday);
}
-main()
+int
+main(int argc, char *argv[])
{
(void) setlocale(LC_ALL, "");
@@ -128,12 +130,12 @@ main()
else
read_tmpl();
}
- exit(0);
+ return (0);
}
-static
-read_tmpl()
+static void
+read_tmpl(void)
{
char *clean_line();
FILE *fp;
@@ -181,8 +183,7 @@ read_tmpl()
char *
-clean_line(s)
-char *s;
+clean_line(char *s)
{
char *ns;
@@ -214,9 +215,8 @@ error(const char *fmt, ...)
exit(1);
}
-static
-generate(fmt)
-char *fmt;
+static void
+generate(char *fmt)
{
char timebuf[1024];
char outbuf[2 * 1024];
@@ -227,15 +227,13 @@ char *fmt;
tb = timebuf;
ob = outbuf;
while (*tb)
- if (isspace(*tb))
- {
+ if (isspace(*tb)) {
++tb;
space++;
- }
+ }
else
{
- if (space)
- {
+ if (space) {
*ob++ = '[';
*ob++ = ' ';
*ob++ = '\t';
@@ -243,15 +241,14 @@ char *fmt;
*ob++ = '*';
space = 0;
continue;
- }
- if (isalpha(*tb))
- {
+ }
+ if (isalpha(*tb)) {
*ob++ = '[';
*ob++ = toupper(*tb);
*ob++ = tolower(*tb++);
*ob++ = ']';
continue;
- }
+ }
else
*ob++ = *tb++;
if (*(tb - 1) == '0')
diff --git a/usr/src/cmd/diff/diff.c b/usr/src/cmd/diff/diff.c
index 6512900259..6832eafb8f 100644
--- a/usr/src/cmd/diff/diff.c
+++ b/usr/src/cmd/diff/diff.c
@@ -20,7 +20,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -214,7 +214,7 @@ ralloc(void *p, size_t n) /* compacting reallocation */
}
-void
+int
main(int argc, char **argv)
{
int k;
@@ -500,6 +500,7 @@ same:
(void) printf(gettext("No differences encountered\n"));
done();
/*NOTREACHED*/
+ return (0);
}
static int
diff --git a/usr/src/cmd/diff/diffh.c b/usr/src/cmd/diff/diffh.c
index 6d64cb89ce..d25b0b29fd 100644
--- a/usr/src/cmd/diff/diffh.c
+++ b/usr/src/cmd/diff/diffh.c
@@ -19,15 +19,15 @@
*
* CDDL HEADER END
*/
-/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
-/* All Rights Reserved */
-
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
+/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
+/* All Rights Reserved */
+
#pragma ident "%Z%%M% %I% %E% SMI"
#include <stdio.h>
@@ -170,6 +170,7 @@ main(int argc, char **argv)
return (1);
}
/* NOTREACHED */
+ return (0);
}
/* synch on C successive matches */
diff --git a/usr/src/cmd/logadm/conf.c b/usr/src/cmd/logadm/conf.c
index 3a939fffb2..045b6243bb 100644
--- a/usr/src/cmd/logadm/conf.c
+++ b/usr/src/cmd/logadm/conf.c
@@ -19,15 +19,18 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright (c) 2001 by Sun Microsystems, Inc.
- * All rights reserved.
- *
- * logadm/conf.c -- configuration file module
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
*/
#pragma ident "%Z%%M% %I% %E% SMI"
+/*
+ * logadm/conf.c -- configuration file module
+ */
+
#include <stdio.h>
#include <libintl.h>
#include <fcntl.h>
@@ -61,7 +64,7 @@ static boolean_t Confchanged; /* true if we need to write changes back */
* our structured representation of the configuration file
* is made up of a list of these
*/
-static struct confinfo {
+struct confinfo {
struct confinfo *cf_next;
int cf_lineno; /* line number in file */
const char *cf_entry; /* name of entry, if line has an entry */
diff --git a/usr/src/cmd/logadm/opts.c b/usr/src/cmd/logadm/opts.c
index b7ad80fbe0..61e9e7593c 100644
--- a/usr/src/cmd/logadm/opts.c
+++ b/usr/src/cmd/logadm/opts.c
@@ -19,15 +19,18 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright (c) 2001 by Sun Microsystems, Inc.
- * All rights reserved.
- *
- * logadm/opts.c -- options handling routines
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
*/
#pragma ident "%Z%%M% %I% %E% SMI"
+/*
+ * logadm/opts.c -- options handling routines
+ */
+
#include <stdio.h>
#include <libintl.h>
#include <stdlib.h>
@@ -334,6 +337,7 @@ opts_parse_bytes(const char *o, const char *optarg)
err(EF_FILE|EF_JMP,
"Option '%c' requires number with suffix from [bkmg]", *o);
/*NOTREACHED*/
+ return (0);
}
/*
@@ -381,10 +385,11 @@ opts_parse_seconds(const char *o, const char *optarg)
err(EF_FILE|EF_JMP,
"Option '%c' requires number with suffix from [hdwmy]", *o);
/*NOTREACHED*/
+ return (0);
}
/* info passed between opts_print() and printer() */
-static struct printerinfo {
+struct printerinfo {
FILE *stream;
int isswitch;
char *exclude;
diff --git a/usr/src/cmd/logger/logger.c b/usr/src/cmd/logger/logger.c
index 23a719fb8f..7be89138c9 100644
--- a/usr/src/cmd/logger/logger.c
+++ b/usr/src/cmd/logger/logger.c
@@ -20,7 +20,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -111,9 +111,8 @@ static void usage(void);
* result on the system log, along with a useful tag.
*/
-main(argc, argv)
-int argc;
-char **argv;
+int
+main(int argc, char **argv)
{
char tmp[23];
char *tag = NULL;
@@ -160,8 +159,7 @@ char **argv;
if (strcmp(optarg, "-") == 0)
break;
infile = optarg;
- if (freopen(infile, "r", stdin) == NULL)
- {
+ if (freopen(infile, "r", stdin) == NULL) {
(void) fprintf(stderr, gettext("logger: "));
perror(infile);
exit(1);
diff --git a/usr/src/cmd/more/more.c b/usr/src/cmd/more/more.c
index 9c1fc6bf06..8d52ae5525 100644
--- a/usr/src/cmd/more/more.c
+++ b/usr/src/cmd/more/more.c
@@ -20,7 +20,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2000 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -660,9 +660,8 @@ static char Bell = ctrl('G');
** string "string"
*/
-tailequ (path, string)
-char *path;
-register char *string;
+int
+tailequ(char *path, char *string)
{
return (!strcmp(basename(path), string));
}
diff --git a/usr/src/cmd/syslogd/syslogd.c b/usr/src/cmd/syslogd/syslogd.c
index a1372289cb..45de24f28a 100644
--- a/usr/src/cmd/syslogd/syslogd.c
+++ b/usr/src/cmd/syslogd/syslogd.c
@@ -3276,7 +3276,7 @@ nofile:
* this is called before multiple threads are running, so no mutex
* needs to be held at this time.
*/
-static
+static int
filed_init(struct filed *f)
{
pthread_attr_t stack_attr;
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-21 21:19:05 +0000