PERFORCE change 64893 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=64893

Change 64893 by rwatson at rwatson_tislabs on 2004/11/11 19:29:52

	Correct possible merge-o from integ: variable arguments need to
	be processed in make_dev_credv(), but started/stopped and passed
	down transparently in make_dev() and make_dev_cred().  Otherwise
	all the devices get funny names, which is counter-productive to
	usability and functionality.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/kern/kern_conf.c#12 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_conf.c#12 (text+ko) ====

@@ -442,10 +442,9 @@
 
 static struct cdev *
 make_dev_credv(struct cdevsw *devsw, int minornr, uid_t uid, gid_t gid, 
-    struct ucred *cr, int perms, const char *fmt, ...)
+    struct ucred *cr, int perms, const char *fmt, va_list ap)
 {
 	struct cdev *dev;
-	va_list ap;
 	int i;
 
 	KASSERT((minornr & ~0xffff00ff) == 0,
@@ -469,7 +468,6 @@
 	    ("make_dev() by driver %s on pre-existing device (maj=%d, min=%d, name=%s)",
 	    devsw->d_name, major(dev), minor(dev), devtoname(dev)));
 
-	va_start(ap, fmt);
 	i = vsnrprintf(dev->__si_namebuf, sizeof dev->__si_namebuf, 32, fmt, ap);
 	if (i > (sizeof dev->__si_namebuf - 1)) {
 		printf("WARNING: Device name truncated! (%s)\n", 
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message