From 722a2243a9ff0d9ad6f64c63d87e68a3536d4d73 Mon Sep 17 00:00:00 2001
From: billf <billf@FreeBSD.org>
Date: Mon, 16 Aug 1999 18:13:39 +0000
Subject: [PATCH] expand_name: 	use pid_t and uid_t in the declaration as that
 is what we are passed 	fix printf formatters accordingly.

Reviewed by:	green
---
 sys/kern/kern_sig.c | 10 +++++-----
 sys/sys/signalvar.h |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index bee9631cea9..4d7edeb0312 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sig.c	8.7 (Berkeley) 4/18/94
- * $Id: kern_sig.c,v 1.58 1999/07/18 13:40:11 peter Exp $
+ * $Id: kern_sig.c,v 1.59 1999/08/14 19:58:58 alfred Exp $
  */
 
 #include "opt_compat.h"
@@ -1288,7 +1288,7 @@ SYSCTL_STRING(_kern, OID_AUTO, corefile, CTLFLAG_RW, corefilename,
 
 char *
 expand_name(name, uid, pid)
-const char *name; int uid; int pid; {
+const char *name; uid_t uid; pid_t pid; {
 	char *temp;
 	char buf[11];		/* Buffer for pid/uid -- max 4B */
 	int i, n;
@@ -1310,7 +1310,7 @@ const char *name; int uid; int pid; {
 				break;
 			case 'N':	/* process name */
 				if ((n + namelen) > MAXPATHLEN) {
-					log(LOG_ERR, "pid %d (%s), uid (%d):  Path `%s%s' is too long\n",
+					log(LOG_ERR, "pid %d (%s), uid (%u):  Path `%s%s' is too long\n",
 					    pid, name, uid, temp, name);
 					free(temp, M_TEMP);
 					return NULL;
@@ -1321,7 +1321,7 @@ const char *name; int uid; int pid; {
 			case 'P':	/* process id */
 				l = sprintf(buf, "%u", pid);
 				if ((n + l) > MAXPATHLEN) {
-					log(LOG_ERR, "pid %d (%s), uid (%d):  Path `%s%s' is too long\n",
+					log(LOG_ERR, "pid %d (%s), uid (%u):  Path `%s%s' is too long\n",
 					    pid, name, uid, temp, name);
 					free(temp, M_TEMP);
 					return NULL;
@@ -1332,7 +1332,7 @@ const char *name; int uid; int pid; {
 			case 'U':	/* user id */
 				l = sprintf(buf, "%u", uid);
 				if ((n + l) > MAXPATHLEN) {
-					log(LOG_ERR, "pid %d (%s), uid (%d):  Path `%s%s' is too long\n",
+					log(LOG_ERR, "pid %d (%s), uid (%u):  Path `%s%s' is too long\n",
 					    pid, name, uid, temp, name);
 					free(temp, M_TEMP);
 					return NULL;
diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h
index 48d4b9eff75..e2bdb4a97c6 100644
--- a/sys/sys/signalvar.h
+++ b/sys/sys/signalvar.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signalvar.h	8.6 (Berkeley) 2/19/95
- * $Id: signalvar.h,v 1.23 1999/01/26 02:38:11 julian Exp $
+ * $Id: signalvar.h,v 1.24 1999/07/06 07:13:48 cracauer Exp $
  */
 
 #ifndef	_SYS_SIGNALVAR_H_		/* tmp for user.h */
@@ -158,7 +158,7 @@ extern int sugid_coredump;	/* Sysctl variable kern.sugid_coredump */
  * Machine-independent functions:
  */
 void	execsigs __P((struct proc *p));
-char	*expand_name __P((const char*, int, int));
+char	*expand_name __P((const char*, uid_t, pid_t));
 void	gsignal __P((int pgid, int sig));
 int	issignal __P((struct proc *p));
 void	killproc __P((struct proc *p, char *why));
-- 
2.45.2