Date: Thu, 7 Nov 2024 23:26:40 GMT From: Zhenlei Huang <zlei@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 0be04cb5cb98 - releng/14.2 - ndp: Move the global variable repeat into struct ndp_opts Message-ID: <202411072326.4A7NQefe033673@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch releng/14.2 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0be04cb5cb9854d71cd98b10a35111b289cd21a5 commit 0be04cb5cb9854d71cd98b10a35111b289cd21a5 Author: Zhenlei Huang <zlei@FreeBSD.org> AuthorDate: 2024-10-31 16:32:13 +0000 Commit: Zhenlei Huang <zlei@FreeBSD.org> CommitDate: 2024-11-07 23:26:09 +0000 ndp: Move the global variable repeat into struct ndp_opts An upcoming fix for the netlink based implementation requires this refactoring. No functional change intended. Reviewed by: kp Approved by: re (cperciva) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47233 (cherry picked from commit 12c04071cf18d1b00ffcc7058fb01f4393163ede) (cherry picked from commit 54514cfa5a84a5d4406bbd5ba34f8950cf1a2b89) --- usr.sbin/ndp/ndp.c | 9 ++++----- usr.sbin/ndp/ndp.h | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index e98e506ee482..89666f7eb633 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -125,7 +125,6 @@ static pid_t pid; static int32_t thiszone; /* time difference with gmt */ static int s = -1; -static int repeat = 0; static char host_buf[NI_MAXHOST]; /* getnameinfo() */ static char ifix_buf[IFNAMSIZ]; /* if_indextoname() */ @@ -252,8 +251,8 @@ main(int argc, char **argv) /*NOTREACHED*/ } mode = 'a'; - repeat = atoi(optarg); - if (repeat < 0) { + opts.repeat = atoi(optarg); + if (opts.repeat < 0) { usage(); /*NOTREACHED*/ } @@ -823,10 +822,10 @@ again: if (buf != NULL) free(buf); - if (repeat) { + if (opts.repeat) { xo_emit("\n"); xo_flush(); - sleep(repeat); + sleep(opts.repeat); goto again; } diff --git a/usr.sbin/ndp/ndp.h b/usr.sbin/ndp/ndp.h index 5b2558982e86..6e7aef2e416e 100644 --- a/usr.sbin/ndp/ndp.h +++ b/usr.sbin/ndp/ndp.h @@ -10,6 +10,7 @@ struct ndp_opts { bool tflag; int flags; time_t expire_time; + int repeat; }; extern struct ndp_opts opts;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411072326.4A7NQefe033673>