X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/eae4e80fddb67ed353f32a54c9eeed1c1527e5a9..dc4d0c4bf247cfc88e1f3f9463fa2264d3d226b5:/uip/imaptest.c?ds=sidebyside

diff --git a/uip/imaptest.c b/uip/imaptest.c
index e51fe2c5..01d3ee52 100644
--- a/uip/imaptest.c
+++ b/uip/imaptest.c
@@ -44,7 +44,7 @@ struct imap_msg;
 
 struct imap_msg {
     char *command;		/* Command to send */
-    int queue;			/* If true, queue for later delivery */
+    bool queue;			/* If true, queue for later delivery */
     struct imap_msg *next;	/* Next pointer */
 };
 
@@ -73,7 +73,7 @@ static void parse_capability(const char *, unsigned int len);
 static int capability_set(const char *);
 static void clear_capability(void);
 static int have_capability(void);
-static int send_imap_command(netsec_context *, int noflush, char **errstr,
+static int send_imap_command(netsec_context *, bool noflush, char **errstr,
 			     const char *fmt, ...) CHECK_PRINTF(4, 5);
 static int get_imap_response(netsec_context *, const char *token,
 			     char **tokenresp, char **status, int failerr,
@@ -82,7 +82,7 @@ static int get_imap_response(netsec_context *, const char *token,
 static void ts_report(struct timeval *tv, const char *fmt, ...)
 		      CHECK_PRINTF(2, 3);
 
-static void add_msg(int queue, const char *fmt, ...) CHECK_PRINTF(2, 3);
+static void add_msg(bool queue, const char *fmt, ...) CHECK_PRINTF(2, 3);
 
 static bool timestamp = false;
 
@@ -261,7 +261,7 @@ main (int argc, char **argv)
     } else {
         char *capstring;
 
-	if (send_imap_command(nsc, 0, &errstr, "CAPABILITY") != OK) {
+	if (send_imap_command(nsc, false, &errstr, "CAPABILITY") != OK) {
 	    fprintf(stderr, "Unable to send CAPABILITY command: %s\n", errstr);
 	    goto finish;
 	}
@@ -287,7 +287,7 @@ main (int argc, char **argv)
 		    "has no support for STARTTLS\n");
 	    goto finish;
 	}
-	if (send_imap_command(nsc, 0, &errstr, "STARTTLS") != OK) {
+	if (send_imap_command(nsc, false, &errstr, "STARTTLS") != OK) {
 	    fprintf(stderr, "Unable to issue STARTTLS: %s\n", errstr);
 	    goto finish;
 	}
@@ -327,7 +327,7 @@ main (int argc, char **argv)
     if (!have_capability()) {
         char *capstring;
 
-	if (send_imap_command(nsc, 0, &errstr, "CAPABILITY") != OK) {
+	if (send_imap_command(nsc, false, &errstr, "CAPABILITY") != OK) {
 	    fprintf(stderr, "Unable to send CAPABILITY command: %s\n", errstr);
 	    goto finish;
 	}
@@ -377,7 +377,8 @@ main (int argc, char **argv)
 	free(imsg);
     }
 
-    ts_report(&tv_auth, "Total command execution time");
+    if (timestamp)
+	ts_report(&tv_auth, "Total command execution time");
 
     send_imap_command(nsc, 0, NULL, "LOGOUT");
     get_imap_response(nsc, NULL, NULL, NULL, 0, NULL);
@@ -385,7 +386,8 @@ main (int argc, char **argv)
 finish:
     netsec_shutdown(nsc);
 
-    ts_report(&tv_start, "Total elapsed time");
+    if (timestamp)
+	ts_report(&tv_start, "Total elapsed time");
 
     exit(0);
 }
@@ -637,7 +639,7 @@ imap_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
  */
 
 static int
-send_imap_command(netsec_context *nsc, int noflush, char **errstr,
+send_imap_command(netsec_context *nsc, bool noflush, char **errstr,
 		  const char *fmt, ...)
 {
     static unsigned int seq = 0;	/* Tag sequence number */
@@ -702,7 +704,7 @@ get_imap_response(netsec_context *nsc, const char *token, char **tokenresponse,
 {
     char *line;
     struct imap_cmd *cmd;
-    int numerrs = 0;
+    bool numerrs = false;
 
     if (tokenresponse)
 	*tokenresponse = NULL;
@@ -733,7 +735,7 @@ getline:
 			cmd->next = cmd->next->next;
 			if (failerr && strncmp(line + strlen(cmd2->tag),
 							"OK ", 3) != 0) {
-			    numerrs++;
+			    numerrs = true;
 			    netsec_err(errstr, "%s", line + strlen(cmd2->tag));
 			}
 			free(cmd2);
@@ -749,7 +751,7 @@ getline:
 	}
     }
 
-    return numerrs == 0 ? OK : NOTOK;
+    return numerrs ? NOTOK : OK;
 }
 
 /*
@@ -757,7 +759,7 @@ getline:
  */
 
 static void
-add_msg(int queue, const char *fmt, ...)
+add_msg(bool queue, const char *fmt, ...)
 {
     struct imap_msg *imsg;
     va_list ap;