Added NMH_UNUSED macro for suppressing warnings about unused parameters

[mmh] / mts / smtp / smtp.c

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 8d3a233..df1dbbf 100644 (file)
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -158,7 +158,7 @@ static int sm_werror (void);
 static int smhear (void);
 static int sm_rrecord (char *, int *);
 static int sm_rerror (int);
-static RETSIGTYPE alrmser (int);
+static void alrmser (int);
 static char *EHLOset (char *);
 static int sm_fwrite(char *, int);
 static int sm_fputs(char *);
@@ -396,6 +396,8 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
            return RP_RPLY;
        }
     }
+#else  /* TLS_SUPPORT */
+    NMH_UNUSED (tls);
 #endif /* TLS_SUPPORT */
 
 #ifdef CYRUS_SASL
@@ -446,7 +448,7 @@ sendmail_init (char *client, char *server, int watch, int verbose,
 #ifdef CYRUS_SASL
     char *server_mechs;
 #endif /* CYRUS_SASL */
-    int i, result, vecp;
+    unsigned int i, result, vecp;
     int pdi[2], pdo[2];
     char *vec[15];
 
@@ -1121,6 +1123,8 @@ static int
 sm_get_pass(sasl_conn_t *conn, void *context, int id,
            sasl_secret_t **psecret)
 {
+    NMH_UNUSED (conn);
+
     char **pw_context = (char **) context;
     char *pass = NULL;
     int len;
@@ -1663,9 +1667,11 @@ sm_rerror (int rc)
 }
 
 
-static RETSIGTYPE
+static void
 alrmser (int i)
 {
+    NMH_UNUSED (i);
+
 #ifndef        RELIABLE_SIGNALS
     SIGNAL (SIGALRM, alrmser);
 #endif