diff options
| author | Mike Hommey <mh@glandium.org> | 2022-10-19 20:55:27 +0000 |
|---|---|---|
| committer | Mike Hommey <mh@glandium.org> | 2022-10-19 20:55:27 +0000 |
| commit | 13b465fe00788424c5ecbb9474aa656cd8b457d9 (patch) | |
| tree | 0ea7eb87ad09c198a217af96eb17b2020d6b7cc8 /cmd | |
| parent | af8deb6198aa7ac70e5c36629a08836d1cdd697f (diff) | |
| download | nss-hg-13b465fe00788424c5ecbb9474aa656cd8b457d9.tar.gz | |
Bug 1796280 - Fix -Wunused-{function,variable,but-set-variable} warnings on Windows. r=nss-reviewers,jschanck
Differential Revision: https://phabricator.services.mozilla.com/D159771
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/certutil/keystuff.c | 4 | ||||
| -rw-r--r-- | cmd/lib/secpwd.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cmd/certutil/keystuff.c b/cmd/certutil/keystuff.c index 5b8de250b..9b96bce91 100644 --- a/cmd/certutil/keystuff.c +++ b/cmd/certutil/keystuff.c @@ -44,7 +44,9 @@ static int UpdateRNG(void) { char randbuf[RAND_BUF_SIZE]; +#ifdef XP_UNIX int fd; +#endif int c; int rv = 0; size_t count; @@ -72,10 +74,10 @@ UpdateRNG(void) FPS "%s", meter); FPS "\r|"); +#if defined(XP_UNIX) /* turn off echo on stdin & return on 1 char instead of NL */ fd = fileno(stdin); -#if defined(XP_UNIX) tcgetattr(fd, &tio); orig_lflag = tio.c_lflag; orig_cc_min = tio.c_cc[VMIN]; diff --git a/cmd/lib/secpwd.c b/cmd/lib/secpwd.c index a1af6f541..472bc2615 100644 --- a/cmd/lib/secpwd.c +++ b/cmd/lib/secpwd.c @@ -25,31 +25,29 @@ static char *quiet_fgets(char *buf, int length, FILE *input); #define QUIET_FGETS fgets #endif +#if !defined(_WINDOWS) static void echoOff(int fd) { -#if defined(XP_UNIX) if (isatty(fd)) { struct termios tio; tcgetattr(fd, &tio); tio.c_lflag &= ~ECHO; tcsetattr(fd, TCSAFLUSH, &tio); } -#endif } static void echoOn(int fd) { -#if defined(XP_UNIX) if (isatty(fd)) { struct termios tio; tcgetattr(fd, &tio); tio.c_lflag |= ECHO; tcsetattr(fd, TCSAFLUSH, &tio); } -#endif } +#endif char * SEC_GetPassword(FILE *input, FILE *output, char *prompt, |