online update: Fix many warnings.

Not all yet, though.

Change-Id: Ic4f0fe3ded31d585faefd8bda8ab87f54b88dc6c

6 files changed, 12 insertions, 5 deletions

diff --git a/onlineupdate/source/libmar/inc/mozilla/Attributes.h b/onlineupdate/source/libmar/inc/mozilla/Attributes.h
index b34e7d5af07a..4d38632dbc4b 100644
--- a/onlineupdate/source/libmar/inc/mozilla/Attributes.h
+++ b/onlineupdate/source/libmar/inc/mozilla/Attributes.h
@@ -83,7 +83,7 @@
 #    define MOZ_HAVE_NORETURN            __attribute__((noreturn))
 #  endif
 #elif defined(__GNUC__)
-#  if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
+#  if defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(__cplusplus) && __cplusplus >= 201103L)
 #    define MOZ_HAVE_CXX11_CONSTEXPR
 #    if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0)
 #      define MOZ_HAVE_CXX11_CONSTEXPR_IN_TEMPLATES
diff --git a/onlineupdate/source/libmar/sign/nss_secutil.c b/onlineupdate/source/libmar/sign/nss_secutil.c
index caa124e651d7..ac8954ceb953 100644
--- a/onlineupdate/source/libmar/sign/nss_secutil.c
+++ b/onlineupdate/source/libmar/sign/nss_secutil.c
@@ -66,6 +66,8 @@ GetPasswordString(void *arg, char *prompt)
   char phrase[200] = {'\0'};
   int isInputTerminal = isatty(fileno(stdin));
 
+  (void) arg; (void) prompt; // avoid warnings
+
 #ifndef _WINDOWS
   if (isInputTerminal) {
     input = fopen(consoleName, "r");
diff --git a/onlineupdate/source/libmar/src/mar_extract.c b/onlineupdate/source/libmar/src/mar_extract.c
index f3512e99122c..af2276614bdb 100644
--- a/onlineupdate/source/libmar/src/mar_extract.c
+++ b/onlineupdate/source/libmar/src/mar_extract.c
@@ -40,6 +40,8 @@ static int mar_test_callback(MarFile *mar, const MarItem *item, void *unused) {
   char buf[BLOCKSIZE];
   int fd, len, offset = 0;
 
+  (void) unused; // avoid warnings
+
   if (mar_ensure_parent_dir(item->name))
     return -1;
 
diff --git a/onlineupdate/source/libmar/tool/mar.c b/onlineupdate/source/libmar/tool/mar.c
index 9a961ae9aabd..d14690f5cbe4 100644
--- a/onlineupdate/source/libmar/tool/mar.c
+++ b/onlineupdate/source/libmar/tool/mar.c
@@ -35,12 +35,12 @@ int mar_repackage_and_sign(const char *NSSConfigDir,
                            const char *src,
                            const char * dest);
 
-static void print_version() {
+static void print_version(void) {
   printf("Version: %s\n", MOZ_APP_VERSION);
   printf("Default Channel ID: %s\n", MAR_CHANNEL_ID);
 }
 
-static void print_usage() {
+static void print_usage(void) {
   printf("usage:\n");
   printf("Create a MAR file:\n");
   printf("  mar [-H MARChannelID] [-V ProductVersion] [-C workingDir] "
@@ -99,6 +99,8 @@ static void print_usage() {
 static int mar_test_callback(MarFile *mar,
                              const MarItem *item,
                              void *unused) {
+  (void) mar; (void) unused; // avoid warnings
+
   printf("%u\t0%o\t%s\n", item->length, item->flags, item->name);
   return 0;
 }
diff --git a/onlineupdate/source/libmar/verify/cryptox.h b/onlineupdate/source/libmar/verify/cryptox.h
index 8b926814a70b..acecae64ccb0 100644
--- a/onlineupdate/source/libmar/verify/cryptox.h
+++ b/onlineupdate/source/libmar/verify/cryptox.h
@@ -57,7 +57,7 @@ CryptoX_Result NSS_VerifySignature(VFYContext * const *ctx ,
 #define CryptoX_FreeCertificate(cert) \
   CERT_DestroyCertificate(*cert)
 
-#elif MACOSX
+#elif defined(MACOSX)
 
 #define CryptoX_InvalidHandleValue NULL
 #define CryptoX_ProviderHandle void*
diff --git a/onlineupdate/source/libmar/verify/mar_verify.c b/onlineupdate/source/libmar/verify/mar_verify.c
index 954fbbb5e659..c9f715a4dc65 100644
--- a/onlineupdate/source/libmar/verify/mar_verify.c
+++ b/onlineupdate/source/libmar/verify/mar_verify.c
@@ -194,7 +194,6 @@ mar_extract_and_verify_signatures_fp(FILE *fp,
                                      CryptoX_ProviderHandle provider,
                                      CryptoX_PublicKey *keys,
                                      uint32_t keyCount) {
-  char buf[5] = {0};
   uint32_t signatureCount, signatureLen, numVerified = 0;
   uint32_t signatureAlgorithmIDs[MAX_SIGNATURES];
   int rv = -1;
@@ -346,6 +345,8 @@ mar_verify_signatures_for_fp(FILE *fp,
   uint32_t i;
   int rv = CryptoX_Error;
 
+  (void) provider; (void) keys; // avoid warnings
+
   memset(signatureHandles, 0, sizeof(signatureHandles));
   memset(signatureLengths, 0, sizeof(signatureLengths));