Bug 1796280 - Fix -Wunused-{function,variable,but-set-variable} warnings on Windows. r=nss-reviewers,jschanck

Differential Revision: https://phabricator.services.mozilla.com/D159771

5 files changed, 10 insertions, 6 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,
diff --git a/lib/freebl/blinit.c b/lib/freebl/blinit.c
index e13844929..28642d91e 100644
--- a/lib/freebl/blinit.c
+++ b/lib/freebl/blinit.c
@@ -142,7 +142,7 @@ CheckX86CPUSupport()
 #include <sys/auxv.h>
 #endif
 extern unsigned long getauxval(unsigned long type) __attribute__((weak));
-#elif defined(__arm__) || !defined(__OpenBSD__)
+#elif defined(__arm__) || (!defined(__OpenBSD__) && !defined(_WIN64))
 static unsigned long (*getauxval)(unsigned long) = NULL;
 #endif /* defined(__GNUC__) && __GNUC__ >= 2 && defined(__ELF__)*/
 
diff --git a/lib/jar/jarfile.c b/lib/jar/jarfile.c
index 248c8336c..504ceec2d 100644
--- a/lib/jar/jarfile.c
+++ b/lib/jar/jarfile.c
@@ -755,7 +755,9 @@ jar_listzip(JAR *jar, JAR_FILE fp)
             ZZ_AppendLink(jar->phy, ent);
             pos = phy->offset + phy->length;
         } else if (sigVal == CSIG) {
+#if defined(XP_UNIX)
             unsigned int attr = 0;
+#endif
             if (JAR_FREAD(fp, Central, sizeof *Central) != sizeof *Central) {
                 /* apparently truncated archive */
                 err = JAR_ERR_CORRUPT;
diff --git a/lib/ssl/sslsnce.c b/lib/ssl/sslsnce.c
index 6fa66e740..56edafa1f 100644
--- a/lib/ssl/sslsnce.c
+++ b/lib/ssl/sslsnce.c
@@ -250,8 +250,10 @@ static PRUint32 ssl_max_sid_cache_locks = MAX_SID_CACHE_LOCKS;
 /* forward static function declarations */
 static PRUint32 SIDindex(cacheDesc *cache, const PRIPv6Addr *addr, PRUint8 *s,
                          unsigned nl);
+#if defined(XP_UNIX)
 static SECStatus LaunchLockPoller(cacheDesc *cache);
 static SECStatus StopLockPoller(cacheDesc *cache);
+#endif
 
 struct inheritanceStr {
     PRUint32 cacheMemSize;