summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/lib/libsys/common/libsys.sh12
-rw-r--r--usr/src/lib/libtnf/libtnf.h6
-rw-r--r--usr/src/lib/libuuid/common/uuid_misc.c5
-rw-r--r--usr/src/lib/watchmalloc/common/malloc.c12
-rw-r--r--usr/src/ucbcmd/mkstr/mkstr.c85
-rw-r--r--usr/src/ucbcmd/whoami/whoami.c23
6 files changed, 75 insertions, 68 deletions
diff --git a/usr/src/lib/libsys/common/libsys.sh b/usr/src/lib/libsys/common/libsys.sh
index 42f42503ce..4da1d42b66 100644
--- a/usr/src/lib/libsys/common/libsys.sh
+++ b/usr/src/lib/libsys/common/libsys.sh
@@ -20,12 +20,14 @@
#
# CDDL HEADER END
#
+
#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1995 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
+
+#ident "%Z%%M% %I% %E% SMI"
+
# Stub library for programmer's interface to libsys. Used to satisfy ld(1)
# processing, and serves as a precedence place-holder at execution-time.
@@ -38,7 +40,7 @@ awk '
flag = "";
if ($1 == "f") {
printf("void *\n%s%s()\n{\n", flag, $3);
- printf("\t/*NOTREACHED*/\n}\n\n");
+ printf("\t/*NOTREACHED*/\n\treturn (0);\n}\n\n");
} else {
if ($4 == "1")
printf("%s %s%s %s %s\n\n", $5, flag, $3, $6, $7);
diff --git a/usr/src/lib/libtnf/libtnf.h b/usr/src/lib/libtnf/libtnf.h
index 27c111cbed..777fc2dd5c 100644
--- a/usr/src/lib/libtnf/libtnf.h
+++ b/usr/src/lib/libtnf/libtnf.h
@@ -19,8 +19,10 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright (c) 1994, by Sun Microsytems, Inc.
+ * Copyright 1994 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
*/
#ifndef _LIBTNF_H
@@ -238,7 +240,7 @@ caddr_t _tnf_datum_val(tnf_datum_t);
#else /* _DATUM_MACROS */
/* Some degree of type safety: */
-#define DATUM(x, y) _DATUM(&(x)->INFO_MEMBER_0, y)
+#define DATUM(x, y) _DATUM((uintptr_t)&(x)->INFO_MEMBER_0, y)
#define DATUM_INFO(d) ((struct taginfo *)_DATUM_HI(d))
#define DATUM_VAL(d) ((caddr_t)_DATUM_LO(d))
diff --git a/usr/src/lib/libuuid/common/uuid_misc.c b/usr/src/lib/libuuid/common/uuid_misc.c
index 7aec84fee1..ca1bcfd85c 100644
--- a/usr/src/lib/libuuid/common/uuid_misc.c
+++ b/usr/src/lib/libuuid/common/uuid_misc.c
@@ -19,8 +19,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2000,2002 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2002 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -182,5 +183,5 @@ get_system_time(uuid_time_t *uuid_time)
*/
*uuid_time = (uint64_t)tp.tv_sec * 10000000;
*uuid_time += tp.tv_usec * 10;
- *uuid_time += 0x01B21DD213814000;
+ *uuid_time += 0x01B21DD213814000ULL;
}
diff --git a/usr/src/lib/watchmalloc/common/malloc.c b/usr/src/lib/watchmalloc/common/malloc.c
index 8ea421b939..ff0a4a8469 100644
--- a/usr/src/lib/watchmalloc/common/malloc.c
+++ b/usr/src/lib/watchmalloc/common/malloc.c
@@ -19,16 +19,16 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright (c) 1996-1997, 2000-2001 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2001 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
*/
/* Copyright (c) 1988 AT&T */
/* All Rights Reserved */
-
-#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.30 */
+#pragma ident "%Z%%M% %I% %E% SMI"
/*
* Memory management: malloc(), realloc(), free(), memalign().
@@ -85,8 +85,8 @@ static void unprotect(TREE *);
* 0xfeedbeef and 0xfeedface are invalid pointer values in all programs.
*/
static uint64_t patterns[2] = {
- 0xdeadbeefdeadbeef, /* pattern in a freed block */
- 0xbaddcafebaddcafe /* pattern in an allocated block */
+ 0xdeadbeefdeadbeefULL, /* pattern in a freed block */
+ 0xbaddcafebaddcafeULL /* pattern in an allocated block */
};
static void
diff --git a/usr/src/ucbcmd/mkstr/mkstr.c b/usr/src/ucbcmd/mkstr/mkstr.c
index a3ca0cac9e..07935b14c9 100644
--- a/usr/src/ucbcmd/mkstr/mkstr.c
+++ b/usr/src/ucbcmd/mkstr/mkstr.c
@@ -18,20 +18,15 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
- *
+ */
+
+/*
* Copyright 1992 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
- /* from UCB 4.1 10/01/80 */
-#include <stdio.h>
-#include <locale.h>
-
-#define ungetchar(c) ungetc(c, stdin)
+#pragma ident "%Z%%M% %I% %E% SMI"
-long ftell();
-char *calloc();
/*
* mkstr - create a string error message file by massaging C source
*
@@ -58,15 +53,27 @@ char *calloc();
* existing error message file for recompilation of single routines.
*/
+#include <stdio.h>
+#include <locale.h>
+
+#define ungetchar(c) ungetc(c, stdin)
+
+long ftell();
+char *calloc();
FILE *mesgread, *mesgwrite;
char *progname;
char usagestr[] = "usage: %s [ - ] mesgfile prefix file ...\n";
char name[100], *np;
-main(argc, argv)
- int argc;
- char *argv[];
+int hashit(char *str, char really, unsigned int fakept);
+void process(void);
+void inithash(void);
+int octdigit(char c);
+void copystr(void);
+
+int
+main(int argc, char *argv[])
{
char addon = 0;
@@ -102,14 +109,14 @@ main(argc, argv)
process();
argc--, argv++;
} while (argc > 0);
- exit(0);
- /* NOTREACHED */
+ return (0);
}
-process()
+void
+process(void)
{
- register char *cp;
- register c;
+ char *cp;
+ int c;
for (;;) {
c = getchar();
@@ -130,11 +137,11 @@ process()
}
}
-match(ocp)
- char *ocp;
+int
+match(char *ocp)
{
- register char *cp;
- register c;
+ char *cp;
+ int c;
for (cp = ocp + 1; *cp; cp++) {
c = getchar();
@@ -148,11 +155,12 @@ match(ocp)
return (1);
}
-copystr()
+void
+copystr(void)
{
- register c, ch;
+ int c, ch;
char buf[512];
- register char *cp = buf;
+ char *cp = buf;
for (;;) {
c = getchar();
@@ -211,14 +219,15 @@ out:
printf("%d", hashit(buf, 1, NULL));
}
-octdigit(c)
- char c;
+int
+octdigit(char c)
{
return (c >= '0' && c <= '7');
}
-inithash()
+void
+inithash(void)
{
char buf[512];
int mesgpt = 0;
@@ -234,20 +243,18 @@ inithash()
struct hash {
long hval;
- unsigned hpt;
+ unsigned int hpt;
struct hash *hnext;
} *bucket[NBUCKETS];
-hashit(str, really, fakept)
- char *str;
- char really;
- unsigned fakept;
+int
+hashit(char *str, char really, unsigned int fakept)
{
int i;
- register struct hash *hp;
+ struct hash *hp;
char buf[512];
long hashval = 0;
- register char *cp;
+ char *cp;
if (really)
fflush(mesgwrite);
@@ -287,13 +294,11 @@ hashit(str, really, fakept)
#include <sys/types.h>
#include <sys/stat.h>
-fgetNUL(obuf, rmdr, file)
- char *obuf;
- register int rmdr;
- FILE *file;
+int
+fgetNUL(char *obuf, int rmdr, FILE *file)
{
- register c;
- register char *buf = obuf;
+ int c;
+ char *buf = obuf;
while (--rmdr > 0 && (c = getc(file)) != 0 && c != EOF)
*buf++ = c;
diff --git a/usr/src/ucbcmd/whoami/whoami.c b/usr/src/ucbcmd/whoami/whoami.c
index a13ca2b973..d7beb3a5a4 100644
--- a/usr/src/ucbcmd/whoami/whoami.c
+++ b/usr/src/ucbcmd/whoami/whoami.c
@@ -1,19 +1,18 @@
+/*
+ * Copyright 1988 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ */
+
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
-
/*
* Copyright (c) 1980 Regents of the University of California.
* All rights reserved. The Berkeley software License Agreement
* specifies the terms and conditions for redistribution.
*/
-/*
- * Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, Sun Microsystems, Inc.
- * All Rights Reserved.
- */
-
-#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.1 */
+#pragma ident "%Z%%M% %I% %E% SMI"
#include <unistd.h>
@@ -27,12 +26,11 @@
/*
* whoami
*/
-struct passwd *getpwuid();
-void
-main()
+int
+main(int argc, char *argv[])
{
- register struct passwd *pp;
+ struct passwd *pp;
uid_t euid;
/* Set locale environment variables local definitions */
@@ -49,6 +47,5 @@ main()
exit(1);
}
printf("%s\n", pp->pw_name);
- exit(0);
- /*NOTREACHED*/
+ return (0);
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-07 22:07:39 +0000