From owner-freebsd-stable Mon Jul 10 8:41:16 2000 Delivered-To: freebsd-stable@freebsd.org Received: from anchor-post-30.mail.demon.net (anchor-post-30.mail.demon.net [194.217.242.88]) by hub.freebsd.org (Postfix) with ESMTP id 5BC2137BBC5 for ; Mon, 10 Jul 2000 08:41:09 -0700 (PDT) (envelope-from n_hibma@qubesoft.com) Received: from calcaphon.demon.co.uk ([193.237.19.5] helo=bluebottle.qubesoft.com) by anchor-post-30.mail.demon.net with esmtp (Exim 2.12 #1) id 13BfgA-000FKi-0U; Mon, 10 Jul 2000 16:41:06 +0100 Received: from henny.webweaving.org (henny.qubesoft.com [192.168.1.5]) by bluebottle.qubesoft.com (8.9.3/8.9.1) with ESMTP id QAA28668; Mon, 10 Jul 2000 16:41:04 +0100 (BST) (envelope-from n_hibma@qubesoft.com) Received: from localhost (localhost [127.0.0.1]) by henny.webweaving.org (8.9.3/8.9.3) with ESMTP id QAA06382; Mon, 10 Jul 2000 16:35:10 +0100 (BST) (envelope-from n_hibma@qubesoft.com) Date: Mon, 10 Jul 2000 16:35:10 +0100 (BST) From: Nick Hibma X-Sender: n_hibma@localhost Reply-To: Nick Hibma To: Matthew Jacob Cc: FreeBSD STABLE Mailing List Subject: Re: I hope you do you don't mind a missing MFC... In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG 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< 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