warns+style patch for ktrace
This message is in MIME format. The first part should be readable text,
while the remaining parts are likely unreadable without MIME-aware tools.
Send mail to mime@docserver.cac.washington.edu for more info.
---259921185-915772724-1113042075=:22923
Content-Type: TEXT/PLAIN; charset=US-ASCII
Attached is a patch to make usr.bin/ktrace WARNS=6 and style(9) clean.
--
Haakon Schad Bergsaker
---259921185-915772724-1113042075=:22923
Content-Type: TEXT/PLAIN; charset=US-ASCII; name="ktrace.patch"
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.LNX.4.58-L.0504091221150.22923@europa.uio.no>
Content-Description:
Content-Disposition: attachment; filename="ktrace.patch"
SW5kZXg6IE1ha2VmaWxlDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1Mg
ZmlsZTogL2hvbWUvZGN2cy9zcmMvdXNyLmJpbi9rdHJhY2UvTWFrZWZpbGUs
dg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjINCmRpZmYgLXUgLXIxLjIgTWFr
ZWZpbGUNCi0tLSBNYWtlZmlsZQkxNyBKdW4gMjAwMyAwNDoyOToyNyAtMDAw
MAkxLjINCisrKyBNYWtlZmlsZQk5IEFwciAyMDA1IDExOjI3OjAyIC0wMDAw
DQpAQCAtNSw1ICs1LDYgQEANCiBQUk9HPQlrdHJhY2UNCiBTUkNTPQlrdHJh
Y2UuYyBzdWJyLmMNCiBNTElOS1M9IGt0cmFjZS4xIHRyYWNlLjEgDQorV0FS
TlM/PSA2DQogDQogLmluY2x1ZGUgPGJzZC5wcm9nLm1rPg0KSW5kZXg6IGt0
cmFjZS5jDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2hv
bWUvZGN2cy9zcmMvdXNyLmJpbi9rdHJhY2Uva3RyYWNlLmMsdg0KcmV0cmll
dmluZyByZXZpc2lvbiAxLjMNCmRpZmYgLXUgLXIxLjMga3RyYWNlLmMNCi0t
LSBrdHJhY2UuYwk0IE9jdCAyMDAzIDIwOjM2OjQ2IC0wMDAwCTEuMw0KKysr
IGt0cmFjZS5jCTkgQXByIDIwMDUgMTI6MTI6NDMgLTAwMDANCkBAIC00Niwy
NyArNDYsMzAgQEANCiANCiAjaW5jbHVkZSA8ZXJyLmg+DQogI2luY2x1ZGUg
PHN0ZGlvLmg+DQorI2luY2x1ZGUgPHN0ZGxpYi5oPg0KICNpbmNsdWRlIDx1
bmlzdGQuaD4NCiANCiAjaW5jbHVkZSAia3RyYWNlLmgiDQogDQotdm9pZCBu
b19rdHJhY2UoaW50KTsNCi12b2lkIHVzYWdlKHZvaWQpOw0KK3N0YXRpYyB2
b2lkIG5vX2t0cmFjZShpbnQpOw0KK3N0YXRpYyB2b2lkIHVzYWdlKHZvaWQp
Ow0KK3N0YXRpYyBpbnQgcnBpZChjaGFyICpwKTsNCiANCitpbnQNCiBtYWlu
KGludCBhcmdjLCBjaGFyICoqYXJndikNCiB7DQogCWVudW0geyBOT1RTRVQs
IENMRUFSLCBDTEVBUkFMTCB9IGNsZWFyOw0KIAlpbnQgYXBwZW5kLCBjaCwg
ZmQsIGluaGVyaXQsIG9wcywgcGlkLCBwaWRzZXQsIHRycG9pbnRzOw0KLQlj
aGFyICp0cmFjZWZpbGU7DQorCWNvbnN0IGNoYXIgKnRyYWNlZmlsZTsNCiAJ
bW9kZV90IG9tYXNrOw0KIAlzdHJ1Y3Qgc3RhdCBzYjsNCiANCiAJY2xlYXIg
PSBOT1RTRVQ7DQotCWFwcGVuZCA9IG9wcyA9IHBpZHNldCA9IGluaGVyaXQg
PSAwOw0KKwlhcHBlbmQgPSBvcHMgPSBwaWQgPSBwaWRzZXQgPSBpbmhlcml0
ID0gMDsNCiAJdHJwb2ludHMgPSBERUZfUE9JTlRTOw0KIAl0cmFjZWZpbGUg
PSBERUZfVFJBQ0VGSUxFOw0KLQl3aGlsZSAoKGNoID0gZ2V0b3B0KGFyZ2Ms
YXJndiwiYUNjZGY6ZzppcDp0OiIpKSAhPSAtMSkNCi0JCXN3aXRjaCgoY2hh
ciljaCkgew0KKwl3aGlsZSAoKGNoID0gZ2V0b3B0KGFyZ2MsIGFyZ3YsICJh
Q2NkZjpnOmlwOnQ6IikpICE9IC0xKQ0KKwkJc3dpdGNoIChjaCkgew0KIAkJ
Y2FzZSAnYSc6DQogCQkJYXBwZW5kID0gMTsNCiAJCQlicmVhazsNCkBAIC0x
MDcsMTMgKzExMCwxMyBAQA0KIAlhcmd2ICs9IG9wdGluZDsNCiAJYXJnYyAt
PSBvcHRpbmQ7DQogCQ0KLQlpZiAocGlkc2V0ICYmICphcmd2IHx8ICFwaWRz
ZXQgJiYgISphcmd2KQ0KKwlpZiAoKHBpZHNldCAmJiAqYXJndikgfHwgKCFw
aWRzZXQgJiYgISphcmd2KSkNCiAJCXVzYWdlKCk7DQogCQkJDQogCWlmIChp
bmhlcml0KQ0KIAkJdHJwb2ludHMgfD0gS1RSRkFDX0lOSEVSSVQ7DQogDQot
CSh2b2lkKXNpZ25hbChTSUdTWVMsIG5vX2t0cmFjZSk7DQorCXNpZ25hbChT
SUdTWVMsIG5vX2t0cmFjZSk7DQogCWlmIChjbGVhciAhPSBOT1RTRVQpIHsN
CiAJCWlmIChjbGVhciA9PSBDTEVBUkFMTCkgew0KIAkJCW9wcyA9IEtUUk9Q
X0NMRUFSIHwgS1RSRkxBR19ERVNDRU5EOw0KQEAgLTE0MSw4ICsxNDQsOCBA
QA0KIAkJICAgIERFRkZJTEVNT0RFKSkgPCAwKQ0KIAkJCWVycigxLCAiJXMi
LCB0cmFjZWZpbGUpOw0KIAl9DQotCSh2b2lkKXVtYXNrKG9tYXNrKTsNCi0J
KHZvaWQpY2xvc2UoZmQpOw0KKwl1bWFzayhvbWFzayk7DQorCWNsb3NlKGZk
KTsNCiANCiAJaWYgKCphcmd2KSB7IA0KIAkJaWYgKGt0cmFjZSh0cmFjZWZp
bGUsIG9wcywgdHJwb2ludHMsIGdldHBpZCgpKSA8IDApDQpAQCAtMTU1LDYg
KzE1OCw3IEBADQogCWV4aXQoMCk7DQogfQ0KIA0KK2ludA0KIHJwaWQoY2hh
ciAqcCkNCiB7DQogCXN0YXRpYyBpbnQgZmlyc3Q7DQpAQCAtMTczLDE2ICsx
NzcsMTYgQEANCiB2b2lkDQogdXNhZ2Uodm9pZCkNCiB7DQotCSh2b2lkKWZw
cmludGYoc3RkZXJyLCAiJXNcbiVzXG4iLA0KKwlmcHJpbnRmKHN0ZGVyciwg
IiVzXG4lc1xuIiwNCiAidXNhZ2U6IGt0cmFjZSBbLWFDY2RpXSBbLWYgdHJm
aWxlXSBbLWcgcGdycCB8IC1wIHBpZF0gWy10IGNuaXN1d10iLA0KICIgICAg
ICAga3RyYWNlIFstYWRpXSBbLWYgdHJmaWxlXSBbLXQgY25pc3V3XSBjb21t
YW5kIik7DQogCWV4aXQoMSk7DQogfQ0KIA0KIHZvaWQNCi1ub19rdHJhY2Uo
aW50IHNpZykNCitub19rdHJhY2UoX191bnVzZWQgaW50IHNpZykNCiB7DQot
ICAgICAgICAodm9pZClmcHJpbnRmKHN0ZGVyciwNCisgICAgICAgIGZwcmlu
dGYoc3RkZXJyLA0KICJlcnJvcjpcdGt0cmFjZSgpIHN5c3RlbSBjYWxsIG5v
dCBzdXBwb3J0ZWQgaW4gdGhlIHJ1bm5pbmcga2VybmVsXG5cdHJlLWNvbXBp
bGUga2VybmVsIHdpdGggJ29wdGlvbnMgS1RSQUNFJ1xuIik7DQogICAgICAg
ICBleGl0KDEpOw0KIH0NCkluZGV4OiBrdHJhY2UuaA0KPT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQ0KUkNTIGZpbGU6IC9ob21lL2RjdnMvc3JjL3Vzci5iaW4v
a3RyYWNlL2t0cmFjZS5oLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4xDQpk
aWZmIC11IC1yMS4xIGt0cmFjZS5oDQotLS0ga3RyYWNlLmgJMTcgSnVuIDIw
MDMgMDI6NTY6MTMgLTAwMDAJMS4xDQorKysga3RyYWNlLmgJOSBBcHIgMjAw
NSAxMTozNDo0NyAtMDAwMA0KQEAgLTM5LDMgKzM5LDUgQEANCiAjZGVmaW5l
IEFMTF9QT0lOVFMgKERFRl9QT0lOVFMgfCBLVFJGQUNfQ1NXKQ0KIA0KICNk
ZWZpbmUgREVGX1RSQUNFRklMRQkia3RyYWNlLm91dCINCisNCitpbnQgZ2V0
cG9pbnRzKGNoYXIgKik7DQpJbmRleDogc3Vici5jDQo9PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09DQpSQ1MgZmlsZTogL2hvbWUvZGN2cy9zcmMvdXNyLmJpbi9r
dHJhY2Uvc3Vici5jLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS41DQpkaWZm
IC11IC1yMS41IHN1YnIuYw0KLS0tIHN1YnIuYwkyMSBOb3YgMjAwMyAyMjo0
NjoxNCAtMDAwMAkxLjUNCisrKyBzdWJyLmMJOSBBcHIgMjAwNSAxMjowNDo0
NiAtMDAwMA0KQEAgLTM1LDggKzM1LDYgQEANCiAgKiAkRHJhZ29uRmx5OiBz
cmMvdXNyLmJpbi9rdHJhY2Uvc3Vici5jLHYgMS41IDIwMDMvMTEvMjEgMjI6
NDY6MTQgZGlsbG9uIEV4cCAkDQogICovDQogDQotI2RlZmluZSBfS0VSTkVM
X1NUUlVDVFVSRVMNCi0NCiAjaW5jbHVkZSA8c3lzL3BhcmFtLmg+DQogI2lu
Y2x1ZGUgPHN5cy9maWxlLmg+DQogI2luY2x1ZGUgPHN5cy91c2VyLmg+DQpA
QCAtNDcsMTIgKzQ1LDEzIEBADQogDQogI2luY2x1ZGUgImt0cmFjZS5oIg0K
IA0KK2ludA0KIGdldHBvaW50cyhjaGFyICpzKQ0KIHsNCiAJaW50IGZhY3Mg
PSAwOw0KIA0KIAl3aGlsZSAoKnMpIHsNCi0JCXN3aXRjaCgqcykgew0KKwkJ
c3dpdGNoICgqcykgew0KIAkJY2FzZSAnYyc6DQogCQkJZmFjcyB8PSBLVFJG
QUNfU1lTQ0FMTCB8IEtUUkZBQ19TWVNSRVQ7DQogCQkJYnJlYWs7DQpAQCAt
NzUsMzUgKzc0LDkgQEANCiAJCQlmYWNzIHw9IERFRl9QT0lOVFM7DQogCQkJ
YnJlYWs7DQogCQlkZWZhdWx0Og0KLQkJCXJldHVybiAoLTEpOw0KKwkJCXJl
dHVybigtMSk7DQogCQl9DQogCQlzKys7DQogCX0NCi0JcmV0dXJuIChmYWNz
KTsNCi19DQotDQotdGltZXZhbGFkZChzdHJ1Y3QgdGltZXZhbCAqdDEsIHN0
cnVjdCB0aW1ldmFsICp0MikNCi17DQotCXQxLT50dl9zZWMgKz0gdDItPnR2
X3NlYzsNCi0JdDEtPnR2X3VzZWMgKz0gdDItPnR2X3VzZWM7DQotCXRpbWV2
YWxmaXgodDEpOw0KLX0NCi0NCi10aW1ldmFsc3ViKHN0cnVjdCB0aW1ldmFs
ICp0MSwgc3RydWN0IHRpbWV2YWwgKnQyKQ0KLXsNCi0JdDEtPnR2X3NlYyAt
PSB0Mi0+dHZfc2VjOw0KLQl0MS0+dHZfdXNlYyAtPSB0Mi0+dHZfdXNlYzsN
Ci0JdGltZXZhbGZpeCh0MSk7DQotfQ0KLQ0KLXRpbWV2YWxmaXgoc3RydWN0
IHRpbWV2YWwgKnQxKQ0KLXsNCi0JaWYgKHQxLT50dl91c2VjIDwgMCkgew0K
LQkJdDEtPnR2X3NlYy0tOw0KLQkJdDEtPnR2X3VzZWMgKz0gMTAwMDAwMDsN
Ci0JfQ0KLQlpZiAodDEtPnR2X3VzZWMgPj0gMTAwMDAwMCkgew0KLQkJdDEt
PnR2X3NlYysrOw0KLQkJdDEtPnR2X3VzZWMgLT0gMTAwMDAwMDsNCi0JfQ0K
KwlyZXR1cm4oZmFjcyk7DQogfQ0K
---259921185-915772724-1113042075=:22923--