From owner-p4-projects@FreeBSD.ORG Wed Feb 6 15:09:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 68CC416A421; Wed, 6 Feb 2008 15:09:35 +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 2E50316A418 for ; Wed, 6 Feb 2008 15:09:35 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 075BE13C4E8 for ; Wed, 6 Feb 2008 15:09:35 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m16F9ZXN028561 for ; Wed, 6 Feb 2008 15:09:35 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m16F9ZS8028558 for perforce@freebsd.org; Wed, 6 Feb 2008 15:09:35 GMT (envelope-from sephe@FreeBSD.org) Date: Wed, 6 Feb 2008 15:09:35 GMT Message-Id: <200802061509.m16F9ZS8028558@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 134908 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: Wed, 06 Feb 2008 15:09:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=134908 Change 134908 by sephe@sephe_enigma:sam_wifi on 2008/02/06 15:09:24 IFC (don't know why libexec/rtld-aout/support.[ch] are gone) Affected files ... .. //depot/projects/wifi/lib/libfetch/http.c#7 integrate .. //depot/projects/wifi/libexec/rtld-aout/support.c#4 add .. //depot/projects/wifi/libexec/rtld-aout/support.h#4 add .. //depot/projects/wifi/sys/dev/amr/amrreg.h#5 integrate .. //depot/projects/wifi/sys/kern/kern_lock.c#23 integrate Differences ... ==== //depot/projects/wifi/lib/libfetch/http.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.82 2007/12/19 00:26:36 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.83 2008/02/06 11:39:55 des Exp $"); /* * The following copyright applies to the base64 code: @@ -150,7 +150,7 @@ *p - '0'; } else { io->chunksize = io->chunksize * 16 + - 10 + tolower(*p) - 'a'; + 10 + tolower((unsigned char)*p) - 'a'; } } @@ -434,7 +434,8 @@ static const char * http_match(const char *str, const char *hdr) { - while (*str && *hdr && tolower(*str++) == tolower(*hdr++)) + while (*str && *hdr && + tolower((unsigned char)*str++) == tolower((unsigned char)*hdr++)) /* nothing */; if (*str || *hdr != ':') return (NULL); ==== //depot/projects/wifi/sys/dev/amr/amrreg.h#5 (text+ko) ==== @@ -53,7 +53,7 @@ * SUCH DAMAGE. * * - * $FreeBSD: src/sys/dev/amr/amrreg.h,v 1.11 2008/01/24 07:26:53 scottl Exp $ + * $FreeBSD: src/sys/dev/amr/amrreg.h,v 1.12 2008/02/06 14:26:31 scottl Exp $ */ /******************************************************************************** @@ -126,7 +126,6 @@ #define AMR_CONFIG_READ_NVRAM_CONFIG 0x04 #define AMR_CONFIG_WRITE_NVRAM_CONFIG 0x0d -#define AMR_CONFIG_ENQ3_SOLICITED_NOTIFY 0x01 #define AMR_CONFIG_PRODUCT_INFO 0x0e #define AMR_CONFIG_ENQ3 0x0f #define AMR_CONFIG_ENQ3_SOLICITED_NOTIFY 0x01 ==== //depot/projects/wifi/sys/kern/kern_lock.c#23 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_lock.c,v 1.121 2008/02/06 00:37:14 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_lock.c,v 1.122 2008/02/06 13:26:01 attilio Exp $"); #include "opt_ddb.h" #include "opt_global.h" @@ -257,7 +257,7 @@ */ if (lkp->lk_lockholder != td) { lockflags = LK_HAVE_EXCL; - if (td != NULL && !(td->td_pflags & TDP_DEADLKTREAT)) + if (!(td->td_pflags & TDP_DEADLKTREAT)) lockflags |= LK_WANT_EXCL | LK_WANT_UPGRADE; error = acquire(&lkp, extflags, lockflags, &contested, &waitstart); if (error)