sbr/m_maildir.c: Move prototypes from h/prototypes.h to new header.

[nmh] / sbr / message_id.c

diff --git a/sbr/message_id.c b/sbr/message_id.c
index bb71313021501967de473e571a3d15de84efaf45..78f1c4ea35e33e68b9f153fd75f7070846301b97 100644 (file)
--- a/sbr/message_id.c
+++ b/sbr/message_id.c
@@ -1,5 +1,4 @@
-/*
- * message-id.c -- construct the body of a Message-ID or Content-ID
+/* message_id.c -- construct the body of a Message-ID or Content-ID
  *                 header field
  *
  * This code is Copyright (c) 2012, by the authors of nmh.  See the
@@ -8,9 +7,8 @@
  */
 
 #include <h/mh.h>
-#include <unistd.h>    /* for getpid() */
+#include "m_rand.h"
 #include <sys/time.h>  /* for gettimeofday() */
-#include <stdio.h>
 
 
 static enum {
@@ -23,15 +21,15 @@ static char message_id_[BUFSIZ];
 /* Convert name of message id style to integer value and store it. */
 int
 save_message_id_style (const char *value) {
-  if (! mh_strcasecmp (value, "localname")) {
+  if (! strcasecmp (value, "localname")) {
     message_id_style = NMH_MESSAGE_ID_LOCALNAME;
     return 0;
-  } else if (! mh_strcasecmp (value, "random")) {
+  }
+  if (! strcasecmp (value, "random")) {
     message_id_style = NMH_MESSAGE_ID_RANDOM;
     return 0;
-  } else {
-    return 1;
   }
+  return 1;
 }