From owner-p4-projects@FreeBSD.ORG Tue Jul 21 01:14:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC2AC106566B; Tue, 21 Jul 2009 01:14:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 87D881065672 for ; Tue, 21 Jul 2009 01:14:21 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 762BB8FC1A for ; Tue, 21 Jul 2009 01:14:21 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6L1ELpU038484 for ; Tue, 21 Jul 2009 01:14:21 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6L1ELuL038482 for perforce@freebsd.org; Tue, 21 Jul 2009 01:14:21 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 21 Jul 2009 01:14:21 GMT Message-Id: <200907210114.n6L1ELuL038482@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 166341 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jul 2009 01:14:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=166341 Change 166341 by pgj@petymeg-current on 2009/07/21 01:14:02 Use TAILQ for interface_type. Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#29 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#35 edit Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#29 (text+ko) ==== @@ -225,11 +225,11 @@ struct intfaddr_type *it_maddress[IFTYPE_MAXADDRCNT]; int it_maddrcnt; - LIST_ENTRY(interface_type) it_list; + TAILQ_ENTRY(interface_type) it_list; }; struct interface_type_list { - LIST_HEAD(, interface_type) itl_list; + TAILQ_HEAD(, interface_type) itl_list; int itl_length; int itl_error; }; ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#35 (text+ko) ==== @@ -731,7 +731,7 @@ itp->it_type = type; itp->it_physical = physical; strlcpy(itp->it_name, name, IFTYPE_MAXNAME); - LIST_INSERT_HEAD(&list->itl_list, itp, it_list); + TAILQ_INSERT_TAIL(&list->itl_list, itp, it_list); list->itl_length += 1; return (itp); } @@ -761,7 +761,7 @@ if (itlp == NULL) return (NULL); - LIST_INIT(&itlp->itl_list); + TAILQ_INIT(&itlp->itl_list); itlp->itl_error = NETSTAT_ERROR_UNDEFINED; itlp->itl_length = 0; return (itlp); @@ -772,8 +772,8 @@ { struct interface_type *itp; - while ((itp = LIST_FIRST(&list->itl_list))) { - LIST_REMOVE(itp, it_list); + while ((itp = TAILQ_FIRST(&list->itl_list))) { + TAILQ_REMOVE(&list->itl_list, itp, it_list); netstat_it_free(itp); } @@ -812,9 +812,9 @@ bzero(itp, sizeof(*itp)); itp->iti_list = list; - itp->iti_first = LIST_FIRST(&list->itl_list); + itp->iti_first = TAILQ_FIRST(&list->itl_list); if (itp->iti_first != NULL) - itp->iti_next = LIST_NEXT(itp->iti_first, it_list); + itp->iti_next = TAILQ_NEXT(itp->iti_first, it_list); *iterator = itp; return (0); } @@ -822,7 +822,7 @@ const struct interface_type * netstat_iti_first(struct interface_type_iterator *itip) { - itip->iti_next = LIST_NEXT(itip->iti_first, it_list); + itip->iti_next = TAILQ_NEXT(itip->iti_first, it_list); return (itip->iti_first); } @@ -833,7 +833,7 @@ itp = itip->iti_next; if (itip->iti_next != NULL) - itip->iti_next = LIST_NEXT(itip->iti_next, it_list); + itip->iti_next = TAILQ_NEXT(itip->iti_next, it_list); return (itp); }