[src/trunk]: src/sys/dev/usb Make usbd_errstr() always return a useful error ...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8c7a0eb17e57
branches:  trunk
changeset: 475915:8c7a0eb17e57
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Aug 29 19:41:27 1999 +0000

description:
Make usbd_errstr() always return a useful error message; it's not like
the strings are that big.

diffstat:

 sys/dev/usb/usb_subr.c |  15 ++++-----------
 sys/dev/usb/usbdi.h    |   4 ++--
 2 files changed, 6 insertions(+), 13 deletions(-)

diffs (65 lines):

diff -r c6b80348a2c8 -r 8c7a0eb17e57 sys/dev/usb/usb_subr.c
--- a/sys/dev/usb/usb_subr.c    Sun Aug 29 19:08:44 1999 +0000
+++ b/sys/dev/usb/usb_subr.c    Sun Aug 29 19:41:27 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usb_subr.c,v 1.41 1999/08/28 21:42:35 augustss Exp $   */
+/*     $NetBSD: usb_subr.c,v 1.42 1999/08/29 19:41:27 thorpej Exp $    */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -105,8 +105,7 @@
 #include <dev/usb/usbdevs_data.h>
 #endif /* USBVERBOSE */
 
-#ifdef USB_DEBUG
-char *usbd_error_strs[] = {
+const char *usbd_error_strs[] = {
        "NORMAL_COMPLETION",
        "IN_PROGRESS",
        "PENDING_REQUESTS",
@@ -128,25 +127,19 @@
        "INTERRUPTED",
        "XXX",
 };
-#endif
 
-char *
+const char *
 usbd_errstr(err)
        usbd_status err;
 {
        static char buffer[5];
 
-#ifdef  USB_DEBUG
-       if ( err < USBD_ERROR_MAX ) {
+       if (err < USBD_ERROR_MAX) {
                return usbd_error_strs[err];
        } else {
                snprintf(buffer, sizeof buffer, "%d", err);
                return buffer;
        }
-#else
-       snprintf(buffer, sizeof buffer, "%d", err);
-       return buffer;
-#endif
 }
 
 usbd_status
diff -r c6b80348a2c8 -r 8c7a0eb17e57 sys/dev/usb/usbdi.h
--- a/sys/dev/usb/usbdi.h       Sun Aug 29 19:08:44 1999 +0000
+++ b/sys/dev/usb/usbdi.h       Sun Aug 29 19:41:27 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usbdi.h,v 1.24 1999/08/22 20:12:39 augustss Exp $      */
+/*     $NetBSD: usbdi.h,v 1.25 1999/08/29 19:41:27 thorpej Exp $       */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -163,7 +163,7 @@
 void usbd_dopoll __P((usbd_interface_handle));
 void usbd_set_polling __P((usbd_interface_handle iface, int on));
 
-char *usbd_errstr __P((usbd_status err));
+const char *usbd_errstr __P((usbd_status err));
 
 /* NetBSD attachment information */