diff options
| author | dfr <dfr@FreeBSD.org> | 1999-07-24 09:34:12 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 1999-07-24 09:34:12 +0000 |
| commit | 49f6f0f9f07f737a67db278436cbb3c3cf738c26 (patch) | |
| tree | ec0fa0b4434e01c0736d1c6b246a9065ca6e83fa /sys/kern/subr_bus.c | |
| parent | 85e61b75281aa38db19488901ea8948b3c8f5fa6 (diff) | |
| download | FreeBSD-src-49f6f0f9f07f737a67db278436cbb3c3cf738c26.zip FreeBSD-src-49f6f0f9f07f737a67db278436cbb3c3cf738c26.tar.gz | |
This makes the in kernel printf routines conform to the documented
behavior of their userland counterparts with respect to return values.
Submitted by: Matthew N. Dodd <winter@jurai.net>
Diffstat (limited to 'sys/kern/subr_bus.c')
| -rw-r--r-- | sys/kern/subr_bus.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index d4819bf..526b402 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: subr_bus.c,v 1.29 1999/05/30 10:27:11 dfr Exp $ + * $Id: subr_bus.c,v 1.30 1999/07/11 13:42:37 dfr Exp $ */ #include <sys/param.h> @@ -891,25 +891,27 @@ device_get_desc(device_t dev) return dev->desc; } -void +int device_print_prettyname(device_t dev) { const char *name = device_get_name(dev); if (name == 0) name = "(no driver assigned)"; - printf("%s%d: ", name, device_get_unit(dev)); + return(printf("%s%d: ", name, device_get_unit(dev))); } -void +int device_printf(device_t dev, const char * fmt, ...) { va_list ap; + int retval; - device_print_prettyname(dev); + retval = device_print_prettyname(dev); va_start(ap, fmt); - vprintf(fmt, ap); + retval += vprintf(fmt, ap); va_end(ap); + return retval; } static void |
