Date: Fri, 10 Aug 2001 23:06:49 -0400 From: David Hill <david@phobia.ms> To: current@freebsd.org Subject: write.c patch (WARNS 2) Message-ID: <20010810230649.756d5c71.david@phobia.ms>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --Multipart_Fri__10_Aug_2001_23:06:49_-0400_081d3000 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Hello - Here is my patch to make write.c work when WARNS=2. I also did some code cleanup 1. Constify 2. Changed a strncpy to strlcpy 3. Changed (S_IWRITE >> 3) to S_IWGRP 4. Cleaned up 2 pieces of code (declaration and unused variable) when WARNS=2 is set. - David --Multipart_Fri__10_Aug_2001_23:06:49_-0400_081d3000 Content-Type: application/octet-stream; name="write.c.patch" Content-Disposition: attachment; filename="write.c.patch" Content-Transfer-Encoding: base64 ZGlmZiAtcnUgL3Vzci9zcmMvdXNyLmJpbi93cml0ZS5vcmlnL01ha2VmaWxlIC91c3Ivc3JjL3Vz ci5iaW4vd3JpdGUvTWFrZWZpbGUKLS0tIC91c3Ivc3JjL3Vzci5iaW4vd3JpdGUub3JpZy9NYWtl ZmlsZQlGcmkgQXVnIDEwIDIyOjU0OjE2IDIwMDEKKysrIC91c3Ivc3JjL3Vzci5iaW4vd3JpdGUv TWFrZWZpbGUJRnJpIEF1ZyAxMCAyMjo1NDo0NSAyMDAxCkBAIC0zLDUgKzMsNiBAQAogUFJPRz0J d3JpdGUKIEJJTk1PREU9MjU1NQogQklOR1JQPQl0dHkKK1dBUk5TPz0gMgogCiAuaW5jbHVkZSA8 YnNkLnByb2cubWs+CmRpZmYgLXJ1IC91c3Ivc3JjL3Vzci5iaW4vd3JpdGUub3JpZy93cml0ZS5j IC91c3Ivc3JjL3Vzci5iaW4vd3JpdGUvd3JpdGUuYwotLS0gL3Vzci9zcmMvdXNyLmJpbi93cml0 ZS5vcmlnL3dyaXRlLmMJRnJpIEF1ZyAxMCAyMjo1NDoxNiAyMDAxCisrKyAvdXNyL3NyYy91c3Iu YmluL3dyaXRlL3dyaXRlLmMJRnJpIEF1ZyAxMCAyMzowMToxMSAyMDAxCkBAIC02NCwxMiArNjQs MTIgQEAKICNpbmNsdWRlIDx1dG1wLmg+CiAKIHZvaWQgZG9uZSBfX1AoKGludCkpOwotdm9pZCBk b193cml0ZSBfX1AoKGNoYXIgKiwgY2hhciAqLCB1aWRfdCkpOwordm9pZCBkb193cml0ZSBfX1Ao KGNvbnN0IGNoYXIgKiwgY29uc3QgY2hhciAqLCB1aWRfdCkpOwogc3RhdGljIHZvaWQgdXNhZ2Ug X19QKCh2b2lkKSk7Ci1pbnQgdGVybV9jaGsgX19QKChjaGFyICosIGludCAqLCB0aW1lX3QgKiwg aW50KSk7CitpbnQgdGVybV9jaGsgX19QKChjb25zdCBjaGFyICosIGludCAqLCB0aW1lX3QgKiwg aW50KSk7CiB2b2lkIHdyX2ZwdXRzIF9fUCgodW5zaWduZWQgY2hhciAqcykpOwotdm9pZCBzZWFy Y2hfdXRtcCBfX1AoKGNoYXIgKiwgY2hhciAqLCBjaGFyICosIHVpZF90KSk7Ci1pbnQgdXRtcF9j aGsgX19QKChjaGFyICosIGNoYXIgKikpOwordm9pZCBzZWFyY2hfdXRtcCBfX1AoKGNvbnN0IGNo YXIgKiwgY29uc3QgY2hhciAqLCBjaGFyICosIHVpZF90KSk7CitpbnQgdXRtcF9jaGsgX19QKChj b25zdCBjaGFyICosIGNvbnN0IGNoYXIgKikpOwogCiBpbnQKIG1haW4oYXJnYywgYXJndikKQEAg LTEwNyw3ICsxMDcsNyBAQAogCS8qIGNoZWNrIGFyZ3MgKi8KIAlzd2l0Y2ggKGFyZ2MpIHsKIAlj YXNlIDI6Ci0JCXNlYXJjaF91dG1wKGFyZ3ZbMV0sIHR0eSwgbXl0dHksIG15dWlkKTsKKwkJc2Vh cmNoX3V0bXAoYXJndlsxXSwgbXl0dHksIHR0eSwgbXl1aWQpOwogCQlkb193cml0ZSh0dHksIG15 dHR5LCBteXVpZCk7CiAJCWJyZWFrOwogCWNhc2UgMzoKQEAgLTE0MSw3ICsxNDEsNyBAQAogICov CiBpbnQKIHV0bXBfY2hrKHVzZXIsIHR0eSkKLQljaGFyICp1c2VyLCAqdHR5OworCWNvbnN0IGNo YXIgKnVzZXIsICp0dHk7CiB7CiAJc3RydWN0IHV0bXAgdTsKIAlpbnQgdWZkOwpAQCAtMTcyLDgg KzE3Miw5IEBACiAgKiB3cml0aW5nIGZyb20sIHVubGVzcyB0aGF0J3MgdGhlIG9ubHkgdGVybWlu YWwgd2l0aCBtZXNzYWdlcyBlbmFibGVkLgogICovCiB2b2lkCi1zZWFyY2hfdXRtcCh1c2VyLCB0 dHksIG15dHR5LCBteXVpZCkKLQljaGFyICp1c2VyLCAqdHR5LCAqbXl0dHk7CitzZWFyY2hfdXRt cCh1c2VyLCBteXR0eSwgdHR5LCBteXVpZCkKKwljb25zdCBjaGFyICp1c2VyLCAqbXl0dHk7CisJ Y2hhciAqdHR5OwogCXVpZF90IG15dWlkOwogewogCXN0cnVjdCB1dG1wIHU7CkBAIC0xOTAsOCAr MTkxLDcgQEAKIAl3aGlsZSAocmVhZCh1ZmQsIChjaGFyICopICZ1LCBzaXplb2YodSkpID09IHNp emVvZih1KSkKIAkJaWYgKHN0cm5jbXAodXNlciwgdS51dF9uYW1lLCBzaXplb2YodS51dF9uYW1l KSkgPT0gMCkgewogCQkJKytubG9nZ2VkdHR5czsKLQkJCSh2b2lkKXN0cm5jcHkoYXR0eSwgdS51 dF9saW5lLCBVVF9MSU5FU0laRSk7Ci0JCQlhdHR5W1VUX0xJTkVTSVpFXSA9ICdcMCc7CisJCQko dm9pZClzdHJsY3B5KGF0dHksIHUudXRfbGluZSwgVVRfTElORVNJWkUpOwogCQkJaWYgKHRlcm1f Y2hrKGF0dHksICZtc2dzb2ssICZhdGltZSwgMCkpCiAJCQkJY29udGludWU7CS8qIGJhZCB0ZXJt PyBza2lwICovCiAJCQlpZiAobXl1aWQgJiYgIW1zZ3NvaykKQEAgLTIyNyw3ICsyMjcsNyBAQAog ICovCiBpbnQKIHRlcm1fY2hrKHR0eSwgbXNnc29rUCwgYXRpbWVQLCBzaG93ZXJyb3IpCi0JY2hh ciAqdHR5OworCWNvbnN0IGNoYXIgKnR0eTsKIAlpbnQgKm1zZ3Nva1AsIHNob3dlcnJvcjsKIAl0 aW1lX3QgKmF0aW1lUDsKIHsKQEAgLTI0MCw3ICsyNDAsNyBAQAogCQkJd2FybigiJXMiLCBwYXRo KTsKIAkJcmV0dXJuKDEpOwogCX0KLQkqbXNnc29rUCA9IChzLnN0X21vZGUgJiAoU19JV1JJVEUg Pj4gMykpICE9IDA7CS8qIGdyb3VwIHdyaXRlIGJpdCAqLworCSptc2dzb2tQID0gKHMuc3RfbW9k ZSAmIFNfSVdHUlApICE9IDA7CS8qIGdyb3VwIHdyaXRlIGJpdCAqLwogCSphdGltZVAgPSBzLnN0 X2F0aW1lOwogCXJldHVybigwKTsKIH0KQEAgLTI1MCwxMCArMjUwLDExIEBACiAgKi8KIHZvaWQK IGRvX3dyaXRlKHR0eSwgbXl0dHksIG15dWlkKQotCWNoYXIgKnR0eSwgKm15dHR5OworCWNvbnN0 IGNoYXIgKnR0eSwgKm15dHR5OwogCXVpZF90IG15dWlkOwogewotCXJlZ2lzdGVyIGNoYXIgKmxv Z2luLCAqbm93czsKKwlyZWdpc3RlciBjaGFyIGNvbnN0ICpsb2dpbjsKKwlyZWdpc3RlciBjaGFy ICpub3dzOwogCXJlZ2lzdGVyIHN0cnVjdCBwYXNzd2QgKnB3ZDsKIAl0aW1lX3Qgbm93OwogCWNo YXIgcGF0aFtNQVhQQVRITEVOXSwgaG9zdFtNQVhIT1NUTkFNRUxFTl0sIGxpbmVbNTEyXTsKQEAg LTI5Myw2ICsyOTQsNyBAQAogZG9uZShuKQogaW50IG47ICAvKiBzaWduYWwgbnVtYmVyICovCiB7 CisJbiA9IDA7CiAJKHZvaWQpcHJpbnRmKCJFT0ZcclxuIik7CiAJZXhpdCgwKTsKIH0K --Multipart_Fri__10_Aug_2001_23:06:49_-0400_081d3000-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010810230649.756d5c71.david>