From owner-freebsd-net@FreeBSD.ORG Tue Oct 5 20:50:00 2010 Return-Path: Delivered-To: freebsd-net@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BFDC0106566C for ; Tue, 5 Oct 2010 20:50:00 +0000 (UTC) (envelope-from onemda@gmail.com) Received: from mail-pz0-f54.google.com (mail-pz0-f54.google.com [209.85.210.54]) by mx1.freebsd.org (Postfix) with ESMTP id 96FF28FC1D for ; Tue, 5 Oct 2010 20:50:00 +0000 (UTC) Received: by pzk7 with SMTP id 7so100222pzk.13 for ; Tue, 05 Oct 2010 13:50:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:date:message-id :subject:from:to:content-type; bh=Fd9UOLEDZojkHf9XKBxY3i2zor1h78zdm7dMs0ECeBc=; b=D930EPxJwSICiiLnDki9SDTPTZZ13isHDcnrKJECheBYOad6P9VCc6j8lvq2sOkK9H Riai9GzaGCWdZFYv/nXRh4ugTukAyRK+HVZdZCWPDiRUw8e1OcnCIDMoX1XPW52hAInV zXd6iSlEpl3QncDt1Nl2lYw/DB7gpCu8kiWps= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=qW3bO8MVxQy1+D8G6cRYg8HXu8Lm6UVpIfQMjk3SEUVGe7897qneGOCAglBohWjOZh +D1B9SJBl+qeP20YZO7EbFPWZPnBcFoHNRaNQD3ownrgxvGmhG07yi/czAAg9rQ6bATY wy+S5cd6xdIh2LSzfEbxeOM4nQBkWRom099Ls= MIME-Version: 1.0 Received: by 10.142.126.1 with SMTP id y1mr10791018wfc.113.1286309986145; Tue, 05 Oct 2010 13:19:46 -0700 (PDT) Received: by 10.220.187.194 with HTTP; Tue, 5 Oct 2010 13:19:45 -0700 (PDT) Date: Tue, 5 Oct 2010 20:19:45 +0000 Message-ID: From: Paul B Mahol To: freebsd-net@freebsd.org Content-Type: multipart/mixed; boundary=000e0cd30a92cb96980491e46145 Subject: ndis: fix ugly code X-BeenThere: freebsd-net@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Networking and TCP/IP with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Oct 2010 20:50:00 -0000 --000e0cd30a92cb96980491e46145 Content-Type: text/plain; charset=ISO-8859-1 Hi, If clang did not complain, I would probbaly never spot it. Patch attached. --000e0cd30a92cb96980491e46145 Content-Type: text/plain; charset=US-ASCII; name="ndis.txt" Content-Disposition: attachment; filename="ndis.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: file0 ZGlmZiAtLWdpdCBhL3N5cy9jb21wYXQvbmRpcy9zdWJyX250b3Nrcm5sLmMgYi9zeXMvY29tcGF0 L25kaXMvc3Vicl9udG9za3JubC5jCmluZGV4IGJhMWU0OWYuLjcxNGZjZDggMTAwNjQ0Ci0tLSBh L3N5cy9jb21wYXQvbmRpcy9zdWJyX250b3Nrcm5sLmMKKysrIGIvc3lzL2NvbXBhdC9uZGlzL3N1 YnJfbnRvc2tybmwuYwpAQCAtMjc0LDcgKzI3NCw2IEBAIG50b3Nrcm5sX2xpYmluaXQoKQogCWtk cGNfcXVldWUJCSprcTsKIAljYWxsb3V0X2VudHJ5CQkqZTsKIAlpbnQJCQlpOwotCWNoYXIJCQlu YW1lWzY0XTsKIAogCW10eF9pbml0KCZudG9za3JubF9kaXNwYXRjaGxvY2ssCiAJICAgICJudG9z a3JubCBkaXNwYXRjaCBsb2NrIiwgTVRYX05ESVNfTE9DSywgTVRYX0RFRnxNVFhfUkVDVVJTRSk7 CkBAIC0zMjEsOSArMzIwLDggQEAgbnRvc2tybmxfbGliaW5pdCgpCiAjZW5kaWYKIAkJa3EgPSBr cV9xdWV1ZXMgKyBpOwogCQlrcS0+a3FfY3B1ID0gaTsKLQkJc3ByaW50ZihuYW1lLCAiV2luZG93 cyBEUEMgJWQiLCBpKTsKIAkJZXJyb3IgPSBrcHJvY19jcmVhdGUobnRvc2tybmxfZHBjX3RocmVh ZCwga3EsICZwLAotCQkgICAgUkZISUdIUElELCBORElTX0tTVEFDS19QQUdFUywgbmFtZSk7CisJ CSAgICBSRkhJR0hQSUQsIE5ESVNfS1NUQUNLX1BBR0VTLCAiV2luZG93cyBEUEMgJWQiLCBpKTsK IAkJaWYgKGVycm9yKQogCQkJcGFuaWMoImZhaWxlZCB0byBsYXVuY2ggRFBDIHRocmVhZCIpOwog CX0KQEAgLTMzNCw5ICszMzIsOCBAQCBudG9za3JubF9saWJpbml0KCkKIAogCWZvciAoaSA9IDA7 IGkgPCBXT1JLSVRFTV9USFJFQURTOyBpKyspIHsKIAkJa3EgPSB3cV9xdWV1ZXMgKyBpOwotCQlz cHJpbnRmKG5hbWUsICJXaW5kb3dzIFdvcmtpdGVtICVkIiwgaSk7CiAJCWVycm9yID0ga3Byb2Nf Y3JlYXRlKG50b3Nrcm5sX3dvcmtpdGVtX3RocmVhZCwga3EsICZwLAotCQkgICAgUkZISUdIUElE LCBORElTX0tTVEFDS19QQUdFUywgbmFtZSk7CisJCSAgICBSRkhJR0hQSUQsIE5ESVNfS1NUQUNL X1BBR0VTLCAiV2luZG93cyBXb3JraXRlbSAlZCIsIGkpOwogCQlpZiAoZXJyb3IpCiAJCQlwYW5p YygiZmFpbGVkIHRvIGxhdW5jaCB3b3JraXRlbSB0aHJlYWQiKTsKIAl9CkBAIC0zMzgyLDcgKzMz NzksNiBAQCBQc0NyZWF0ZVN5c3RlbVRocmVhZChoYW5kbGUsIHJlcWFjY2Vzcywgb2JqYXR0cnMs IHBoYW5kbGUsCiAJdm9pZAkJCSp0aHJjdHg7CiB7CiAJaW50CQkJZXJyb3I7Ci0JY2hhcgkJCXRu YW1lWzEyOF07CiAJdGhyZWFkX2NvbnRleHQJCSp0YzsKIAlzdHJ1Y3QgcHJvYwkJKnA7CiAKQEAg LTMzOTMsOSArMzM4OSw4IEBAIFBzQ3JlYXRlU3lzdGVtVGhyZWFkKGhhbmRsZSwgcmVxYWNjZXNz LCBvYmphdHRycywgcGhhbmRsZSwKIAl0Yy0+dGNfdGhyY3R4ID0gdGhyY3R4OwogCXRjLT50Y190 aHJmdW5jID0gdGhyZnVuYzsKIAotCXNwcmludGYodG5hbWUsICJ3aW5kb3dzIGt0aHJlYWQgJWQi LCBudG9za3JubF9rdGgpOwogCWVycm9yID0ga3Byb2NfY3JlYXRlKG50b3Nrcm5sX3RocmZ1bmMs IHRjLCAmcCwKLQkgICAgUkZISUdIUElELCBORElTX0tTVEFDS19QQUdFUywgdG5hbWUpOworCSAg ICBSRkhJR0hQSUQsIE5ESVNfS1NUQUNLX1BBR0VTLCAiV2luZG93cyBLdGhyZWFkICVkIiwgbnRv c2tybmxfa3RoKTsKIAogCWlmIChlcnJvcikgewogCQlmcmVlKHRjLCBNX1RFTVApOwo= --000e0cd30a92cb96980491e46145--