Date: Mon, 10 Jul 2000 16:35:10 +0100 (BST) From: Nick Hibma <n_hibma@calcaphon.com> To: Matthew Jacob <mjacob@feral.com> Cc: FreeBSD STABLE Mailing List <stable@FreeBSD.ORG> Subject: Re: I hope you do you don't mind a missing MFC... Message-ID: <Pine.BSF.4.20.0007101634500.6123-100000@localhost> In-Reply-To: <Pine.BSF.4.10.10007100757350.28846-100000@beppo.feral.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Fixed. Sorry.
Nick
On Mon, 10 Jul 2000, Matthew Jacob wrote:
>
> libusb- the DIAGASSERT stuff- I've been trying to make RELEASE
> for alpha for two days......
>
>
> Index: lib/libusb/data.c
> ===================================================================
> RCS file: /home/ncvs/src/lib/libusb/data.c,v
> retrieving revision 1.1.2.1
> diff -u -r1.1.2.1 data.c
> --- lib/libusb/data.c 2000/07/02 13:14:00 1.1.2.1
> +++ lib/libusb/data.c 2000/07/10 14:55:41
> @@ -41,9 +41,6 @@
> int data;
> int i, end, offs;
>
> - _DIAGASSERT(p != NULL);
> - _DIAGASSERT(h != NULL);
> -
> buf = p;
> hpos = h->pos; /* bit position of data */
> hsize = h->report_size; /* bit length of data */
> @@ -72,9 +69,6 @@
> unsigned int hpos;
> unsigned int hsize;
> int i, end, offs, mask;
> -
> - _DIAGASSERT(p != NULL);
> - _DIAGASSERT(h != NULL);
>
> buf = p;
> hpos = h->pos; /* bit position of data */
> Index: lib/libusb/descr.c
> ===================================================================
> RCS file: /home/ncvs/src/lib/libusb/descr.c,v
> retrieving revision 1.1.2.1
> diff -u -r1.1.2.1 descr.c
> --- lib/libusb/descr.c 2000/07/02 13:14:00 1.1.2.1
> +++ lib/libusb/descr.c 2000/07/10 14:55:40
> @@ -51,8 +51,6 @@
> struct usb_ctl_report_desc rep;
> report_desc_t r;
>
> - _DIAGASSERT(fd != -1);
> -
> rep.size = 0;
> if (ioctl(fd, USB_GET_REPORT_DESC, &rep) < 0)
> return (0);
> Index: lib/libusb/parse.c
> ===================================================================
> RCS file: /home/ncvs/src/lib/libusb/parse.c,v
> retrieving revision 1.1.2.1
> diff -u -r1.1.2.1 parse.c
> --- lib/libusb/parse.c 2000/07/02 13:14:00 1.1.2.1
> +++ lib/libusb/parse.c 2000/07/10 14:55:41
> @@ -59,9 +59,6 @@
> static void
> hid_clear_local(hid_item_t *c)
> {
> -
> - _DIAGASSERT(c != NULL);
> -
> c->usage = 0;
> c->usage_minimum = 0;
> c->usage_maximum = 0;
> @@ -79,8 +76,6 @@
> {
> struct hid_data *s;
>
> - _DIAGASSERT(d != NULL);
> -
> s = malloc(sizeof *s);
> memset(s, 0, sizeof *s);
> s->start = s->p = d->data;
> @@ -92,9 +87,6 @@
> void
> hid_end_parse(hid_data_t s)
> {
> -
> - _DIAGASSERT(s != NULL);
> -
> while (s->cur.next) {
> hid_item_t *hi = s->cur.next->next;
> free(s->cur.next);
> @@ -114,9 +106,6 @@
> hid_item_t *hi;
> int i;
>
> - _DIAGASSERT(s != NULL);
> - _DIAGASSERT(h != NULL);
> -
> c = &s->cur;
>
> top:
> @@ -362,9 +351,6 @@
> hid_item_t h;
> int size, id;
>
> - _DIAGASSERT(r != NULL);
> - /* idp may be NULL */
> -
> id = 0;
> if (idp)
> *idp = 0;
> @@ -389,9 +375,6 @@
> hid_item_t *h;
> {
> hid_data_t d;
> -
> - _DIAGASSERT(desc != NULL);
> - _DIAGASSERT(h != NULL);
>
> for (d = hid_start_parse(desc, 1<<k); hid_get_item(d, h); ) {
> if (h->kind == k && !(h->flags & HIO_CONST) && h->usage == u) {
>
>
--
n_hibma@webweaving.org
n_hibma@freebsd.org USB project
http://www.etla.net/~n_hibma/
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.20.0007101634500.6123-100000>