Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Provide a nicer messages if the device read fails.

Browse Source 
From David Sainty in PR bin/15019.
This commit is contained in:
augustss 2001-12-22 12:34:41 +00:00
parent cc381b2d11
commit 5e2e7b5a79
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/usbhidctl/Makefile
View File

@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.4 1999/05/11 21:02:25 augustss Exp $
# $NetBSD: Makefile,v 1.5 2001/12/22 12:34:41 augustss Exp $
.include <bsd.own.mk>
PROG= usbhidctl
SRCS= usbhid.c
LDADD+= -lusb
LDADD+= -lusbhid
DPADD+= ${LIBUSB}
.include <bsd.prog.mk>

10
usr.bin/usbhidctl/usbhid.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: usbhid.c,v 1.18 2001/10/22 22:03:49 augustss Exp $ */
/* $NetBSD: usbhid.c,v 1.19 2001/12/22 12:34:41 augustss Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -570,9 +570,11 @@ devloop(int hidfd, report_desc_t rd, struct Susbvar *varlist, size_t vlsize)
ssize_t readlen;
readlen = read(hidfd, dbuf, dlen);
if (readlen < 0 || dlen != (size_t)readlen)
err(1, "bad read %ld != %ld",
(long)readlen, (long)dlen);
if (readlen < 0)
err(1, "Device read error");
if (dlen != (size_t)readlen)
errx(1, "Unexpected response length: %lu != %lu",
(unsigned long)readlen, (unsigned long)dlen);
collind = 0;
hdata = hid_start_parse(rd, 1 << hid_input);