PERFORCE change 134908 for review

[Sepherosa Ziehau]

http://perforce.freebsd.org/chv.cgi?CH=134908

Change 134908 by sephe at 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 <sys/cdefs.h>
-__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 <sys/cdefs.h>
-__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)