remove unused variable from all copies of _asr_strdname() and print_dname()
This also fixes -Wunused-but-set-variable warnings warnings in smtpd
and smtpctl. The code was imported with asr and then copied around.
ok?
M lib/libc/asr/asr.c
M regress/lib/libc/asr/bin/res_mkquery.c
M regress/lib/libc/asr/bin/res_query.c
M usr.sbin/smtpd/unpack_dns.c
diff dd8cb0714181f660d0f6f501ce5d7c09e7204a5f
643c10a8541a41ff6f22d0b0ea6d3ded75b1e2b2
blob - 7cbf6aab5c9a7e5a36e3e1708fedef9fd0874821
blob + 5a40edf5caca600968dae7629988b687b5f15c35
--- lib/libc/asr/asr.c
+++ lib/libc/asr/asr.c
@@ -853,7 +853,7 @@ _asr_strdname(const char *_dname, char *buf, size_t ma
{
const unsigned char *dname = _dname;
char *res;
- size_t left, n, count;
+ size_t left, count;
if (_dname[0] == 0) {
strlcpy(buf, ".", max);
@@ -862,7 +862,7 @@ _asr_strdname(const char *_dname, char *buf, size_t ma
res = buf;
left = max - 1;
- for (n = 0; dname[0] && left; n += dname[0]) {
+ while (dname[0] && left) {
count = (dname[0] < (left - 1)) ? dname[0] : (left - 1);
memmove(buf, dname + 1, count);
dname += dname[0] + 1;
blob - b32f471cdff9998ccd613f9c705207e9d17051e5
blob + 1228e5abc927df98ad26cc2ebdb431bd1a907f7e
--- regress/lib/libc/asr/bin/res_mkquery.c
+++ regress/lib/libc/asr/bin/res_mkquery.c
@@ -296,7 +296,7 @@ print_dname(const char *_dname, char *buf, size_t max)
{
const unsigned char *dname = _dname;
char *res;
- size_t left, n, count;
+ size_t left, count;
if (_dname[0] == 0) {
strlcpy(buf, ".", max);
@@ -305,7 +305,7 @@ print_dname(const char *_dname, char *buf, size_t max)
res = buf;
left = max - 1;
- for (n = 0; dname[0] && left; n += dname[0]) {
+ while (dname[0] && left) {
count = (dname[0] < (left - 1)) ? dname[0] : (left - 1);
memmove(buf, dname + 1, count);
dname += dname[0] + 1;
blob - ca95a89a7ccdb300ca060589bf77203712306e54
blob + 1309a5724014c9d2e8f8352e12ba80db03b0be89
--- regress/lib/libc/asr/bin/res_query.c
+++ regress/lib/libc/asr/bin/res_query.c
@@ -332,7 +332,7 @@ print_dname(const char *_dname, char *buf, size_t max)
{
const unsigned char *dname = _dname;
char *res;
- size_t left, n, count;
+ size_t left, count;
if (_dname[0] == 0) {
strlcpy(buf, ".", max);
@@ -341,7 +341,7 @@ print_dname(const char *_dname, char *buf, size_t max)
res = buf;
left = max - 1;
- for (n = 0; dname[0] && left; n += dname[0]) {
+ while (dname[0] && left) {
count = (dname[0] < (left - 1)) ? dname[0] : (left - 1);
memmove(buf, dname + 1, count);
dname += dname[0] + 1;
blob - fd7ec6ba6e0b745cb04a151994bcb5a51db110ae
blob + 848d2be321d82a14a9da83f4f034924592377862
--- usr.sbin/smtpd/unpack_dns.c
+++ usr.sbin/smtpd/unpack_dns.c
@@ -195,7 +195,7 @@ print_dname(const char *_dname, char *buf, size_t max)
{
const unsigned char *dname = _dname;
char *res;
- size_t left, n, count;
+ size_t left, count;
if (_dname[0] == 0) {
(void)strlcpy(buf, ".", max);
@@ -204,7 +204,7 @@ print_dname(const char *_dname, char *buf, size_t max)
res = buf;
left = max - 1;
- for (n = 0; dname[0] && left; n += dname[0]) {
+ while (dname[0] && left) {
count = (dname[0] < (left - 1)) ? dname[0] : (left - 1);
memmove(buf, dname + 1, count);
dname += dname[0] + 1;
--
Christian "naddy" Weisgerber [email protected]