Date: Thu, 13 Jan 2011 13:40:37 +0300 From: Sergey Kandaurov <pluknet@freebsd.org> To: freebsd-fs@freebsd.org Subject: Minor change in ufs_quota.c uprintf() fmt Message-ID: <AANLkTin%2BgyZgcvG8rjw4oDaqe%2BEj0zp_EhyMXca4%2B4HV@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
--0016363b8848c755820499b7f2a2 Content-Type: text/plain; charset=ISO-8859-1 Hello. I found a minor issue in sys/ufs/ufs_quota.c: here uprintf() suboptimally formats a quota error message with "%s", while it is a hardcoded null-terminated character string. The purpose of my change is to embed the quota message into uprintf() fmt itself, thus it will look a bit more correct. While here, I fixed whitespaces around there (tab -> 4 spaces). I'm going to check it in if nobody objects. Please, see attached. -- wbr, pluknet --0016363b8848c755820499b7f2a2 Content-Type: application/octet-stream; name="ufs_quota.diff" Content-Disposition: attachment; filename="ufs_quota.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_givj1aym0 SW5kZXg6IHN5cy91ZnMvdWZzL3Vmc19xdW90YS5jCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHN5cy91ZnMvdWZz L3Vmc19xdW90YS5jCShyZXZpc2lvbiAyMTczMDgpCisrKyBzeXMvdWZzL3Vmcy91ZnNfcXVvdGEu Ywkod29ya2luZyBjb3B5KQpAQCAtMjM4LDkgKzIzOCw5IEBACiAJCWRxLT5kcV9mbGFncyB8PSBE UV9NT0Q7CiAJCURRSV9VTkxPQ0soZHEpOwogCQlpZiAod2FybikKLQkJCXVwcmludGYoIlxuJXM6 IHdhcm5pbmcsICVzICVzXG4iLAotCQkJCUlUT1YoaXApLT52X21vdW50LT5tbnRfc3RhdC5mX21u dG9ubmFtZSwKLQkJCQlxdW90YXR5cGVzW2ldLCAiZGlzayBxdW90YSBleGNlZWRlZCIpOworCQkJ dXByaW50ZigiXG4lczogd2FybmluZywgJXMgZGlzayBxdW90YSBleGNlZWRlZFxuIiwKKwkJCSAg ICBJVE9WKGlwKS0+dl9tb3VudC0+bW50X3N0YXQuZl9tbnRvbm5hbWUsCisJCQkgICAgcXVvdGF0 eXBlc1tpXSk7CiAJfQogCXJldHVybiAoMCk7CiB9CkBAIC0yODksMTAgKzI4OSwxMCBAQAogCQkJ ICAgIGlwLT5pX3VpZCA9PSBjcmVkLT5jcl91aWQpIHsKIAkJCQlkcS0+ZHFfZmxhZ3MgfD0gRFFf QkxLUzsKIAkJCQlEUUlfVU5MT0NLKGRxKTsKLQkJCQl1cHJpbnRmKCJcbiVzOiB3cml0ZSBmYWls ZWQsICVzICVzXG4iLAorCQkJCXVwcmludGYoIlxuJXM6IHdyaXRlIGZhaWxlZCwgJXMgIgorCQkJ CSAgICAiZGlzayBxdW90YSBleGNlZWRlZCBmb3IgdG9vIGxvbmdcbiIsCiAJCQkJICAgIElUT1Yo aXApLT52X21vdW50LT5tbnRfc3RhdC5mX21udG9ubmFtZSwKLQkJCQkgICAgcXVvdGF0eXBlc1t0 eXBlXSwKLQkJCQkgICAgImRpc2sgcXVvdGEgZXhjZWVkZWQgZm9yIHRvbyBsb25nIik7CisJCQkJ ICAgIHF1b3RhdHlwZXNbdHlwZV0pOwogCQkJCXJldHVybiAoRURRVU9UKTsKIAkJCX0KIAkJCURR SV9VTkxPQ0soZHEpOwpAQCAtMzg0LDkgKzM4NCw5IEBACiAJCWRxLT5kcV9mbGFncyB8PSBEUV9N T0Q7CiAJCURRSV9VTkxPQ0soZHEpOwogCQlpZiAod2FybikKLQkJCXVwcmludGYoIlxuJXM6IHdh cm5pbmcsICVzICVzXG4iLAotCQkJCUlUT1YoaXApLT52X21vdW50LT5tbnRfc3RhdC5mX21udG9u bmFtZSwKLQkJCQlxdW90YXR5cGVzW2ldLCAiaW5vZGUgcXVvdGEgZXhjZWVkZWQiKTsKKwkJCXVw cmludGYoIlxuJXM6IHdhcm5pbmcsICVzIGlub2RlIHF1b3RhIGV4Y2VlZGVkXG4iLAorCQkJICAg IElUT1YoaXApLT52X21vdW50LT5tbnRfc3RhdC5mX21udG9ubmFtZSwKKwkJCSAgICBxdW90YXR5 cGVzW2ldKTsKIAl9CiAJcmV0dXJuICgwKTsKIH0KQEAgLTQzNCwxMCArNDM0LDEwIEBACiAJCQkg ICAgaXAtPmlfdWlkID09IGNyZWQtPmNyX3VpZCkgewogCQkJCWRxLT5kcV9mbGFncyB8PSBEUV9J Tk9EUzsKIAkJCQlEUUlfVU5MT0NLKGRxKTsKLQkJCQl1cHJpbnRmKCJcbiVzOiB3cml0ZSBmYWls ZWQsICVzICVzXG4iLAotCQkJCQlJVE9WKGlwKS0+dl9tb3VudC0+bW50X3N0YXQuZl9tbnRvbm5h bWUsCi0JCQkJCXF1b3RhdHlwZXNbdHlwZV0sCi0JCQkJCSJpbm9kZSBxdW90YSBleGNlZWRlZCBm b3IgdG9vIGxvbmciKTsKKwkJCQl1cHJpbnRmKCJcbiVzOiB3cml0ZSBmYWlsZWQsICVzICIKKwkJ CQkgICAgImlub2RlIHF1b3RhIGV4Y2VlZGVkIGZvciB0b28gbG9uZ1xuIiwKKwkJCQkgICAgSVRP VihpcCktPnZfbW91bnQtPm1udF9zdGF0LmZfbW50b25uYW1lLAorCQkJCSAgICBxdW90YXR5cGVz W3R5cGVdKTsKIAkJCQlyZXR1cm4gKEVEUVVPVCk7CiAJCQl9CiAJCQlEUUlfVU5MT0NLKGRxKTsK --0016363b8848c755820499b7f2a2--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTin%2BgyZgcvG8rjw4oDaqe%2BEj0zp_EhyMXca4%2B4HV>