The following reply was made to PR usb/183728; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: usb/183728: commit references a PR
Date: Thu, 7 Nov 2013 07:23:01 + (UTC)
Author: hselasky
Date: Thu Nov 7 07:22:51 2013
New Revision: 257779
URL: http://svnweb.freebsd.org/changeset/base/257779
Log:
- Use libusb20_strerror() function instead of custom usb_error() one.
- Rename aux.[ch] to util.[ch] which is a more common name for
utility functions and allows checkout on some non-FreeBSD systems
where the aux.* namespace is reserved.
- Fix some compile warnings while at it.
PR: usb/183728
MFC after: 2 weeks
Added:
head/share/examples/libusb20/util.c
- copied, changed from r238603, head/share/examples/libusb20/aux.c
head/share/examples/libusb20/util.h
- copied, changed from r238603, head/share/examples/libusb20/aux.h
Deleted:
head/share/examples/libusb20/aux.c
head/share/examples/libusb20/aux.h
Modified:
head/share/examples/libusb20/Makefile
head/share/examples/libusb20/bulk.c
head/share/examples/libusb20/control.c
Modified: head/share/examples/libusb20/Makefile
==
--- head/share/examples/libusb20/Makefile Thu Nov 7 04:52:25 2013
(r257778)
+++ head/share/examples/libusb20/Makefile Thu Nov 7 07:22:51 2013
(r257779)
@@ -1,13 +1,14 @@
# $FreeBSD$
TARGETS= bulk control
+CFLAGS+= -Wall
all: $(TARGETS)
-bulk: bulk.o aux.o
- $(CC) $(CFLAGS) -o bulk bulk.o aux.o -lusb
+bulk: bulk.o util.o
+ $(CC) $(CFLAGS) -o bulk bulk.o util.o -lusb
-control: control.o aux.o
- $(CC) $(CFLAGS) -o control control.o aux.o -lusb
+control: control.o util.o
+ $(CC) $(CFLAGS) -o control control.o util.o -lusb
clean:
rm -f $(TARGETS) *.o *~
Modified: head/share/examples/libusb20/bulk.c
==
--- head/share/examples/libusb20/bulk.cThu Nov 7 04:52:25 2013
(r257778)
+++ head/share/examples/libusb20/bulk.cThu Nov 7 07:22:51 2013
(r257779)
@@ -41,7 +41,7 @@
#include libusb20.h
#include libusb20_desc.h
-#include aux.h
+#include util.h
/*
* If you want to see the details of the internal datastructures
@@ -74,7 +74,7 @@ doit(struct libusb20_device *dev)
*/
if ((rv = libusb20_dev_open(dev, 2)) != 0)
{
- fprintf(stderr, libusb20_dev_open: %s\n, usb_error(rv));
+ fprintf(stderr, libusb20_dev_open: %s\n, libusb20_strerror(rv));
return;
}
@@ -84,7 +84,7 @@ doit(struct libusb20_device *dev)
*/
if ((rv = libusb20_dev_set_config_index(dev, 0)) != 0)
{
- fprintf(stderr, libusb20_dev_set_config_index: %s\n, usb_error(rv));
+ fprintf(stderr, libusb20_dev_set_config_index: %s\n,
libusb20_strerror(rv));
return;
}
@@ -97,7 +97,7 @@ doit(struct libusb20_device *dev)
if (xfr_in == NULL || xfr_out == NULL)
{
- fprintf(stderr, libusb20_tr_get_pointer: %s\n, usb_error(rv));
+ fprintf(stderr, libusb20_tr_get_pointer: %s\n, libusb20_strerror(rv));
return;
}
@@ -107,12 +107,12 @@ doit(struct libusb20_device *dev)
*/
if ((rv = libusb20_tr_open(xfr_out, 0, 1, out_ep)) != 0)
{
- fprintf(stderr, libusb20_tr_open: %s\n, usb_error(rv));
+ fprintf(stderr, libusb20_tr_open: %s\n, libusb20_strerror(rv));
return;
}
if ((rv = libusb20_tr_open(xfr_in, 0, 1, in_ep)) != 0)
{
- fprintf(stderr, libusb20_tr_open: %s\n, usb_error(rv));
+ fprintf(stderr, libusb20_tr_open: %s\n, libusb20_strerror(rv));
return;
}
@@ -124,7 +124,7 @@ doit(struct libusb20_device *dev)
if ((rv = libusb20_tr_bulk_intr_sync(xfr_out, out_buf, out_len, rlen,
TIMEOUT))
!= 0)
{
-fprintf(stderr, libusb20_tr_bulk_intr_sync (OUT): %s\n,
usb_error(rv));
+fprintf(stderr, libusb20_tr_bulk_intr_sync (OUT): %s\n,
libusb20_strerror(rv));
}
printf(sent %d bytes\n, rlen);
}
@@ -132,7 +132,7 @@ doit(struct libusb20_device *dev)
if ((rv = libusb20_tr_bulk_intr_sync(xfr_in, in_buf, BUFLEN, rlen,
TIMEOUT))
!= 0)
{
- fprintf(stderr, libusb20_tr_bulk_intr_sync: %s\n, usb_error(rv));
+ fprintf(stderr, libusb20_tr_bulk_intr_sync: %s\n,
libusb20_strerror(rv));
}
printf(received %d bytes\n, rlen);
if (rlen 0)
Modified: head/share/examples/libusb20/control.c
==
--- head/share/examples/libusb20/control.c Thu Nov 7 04:52:25 2013
(r257778)
+++ head/share/examples/libusb20/control.c Thu Nov 7 07:22:51 2013
(r257779)
@@ -11,8 +11,6
