more constness.

[apps/madmutt.git] / sendlib.c

diff --git a/sendlib.c b/sendlib.c
index d55cd55..7c8ab2b 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -1612,19 +1612,13 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
   }
 
   if (mode == 0 && !privacy && option (OPTXMAILER) && !has_agent) {
   }
 
   if (mode == 0 && !privacy && option (OPTXMAILER) && !has_agent) {

-    struct utsname un;
-    char *os;
+    const char *os;

 
     if (OperatingSystem != NULL) {
       os = OperatingSystem;
 
     if (OperatingSystem != NULL) {
       os = OperatingSystem;

-    }
-    else {
-      if (uname (&un) == -1) {
-        os = "UNIX";
-      }
-      else {
-        os = un.sysname;
-      }
+    } else {
+      struct utsname un;
+      os = (uname(&un) == -1) ? "UNIX" : un.sysname;

     }
     /* Add a vanity header */
     fprintf (fp, "User-Agent: %s (%s)\n", mutt_make_version (0), os);
     }
     /* Add a vanity header */
     fprintf (fp, "User-Agent: %s (%s)\n", mutt_make_version (0), os);


@@ -1964,7 +1958,7 @@ static char **add_args (char **args, size_t * argslen, size_t * argsmax,
   return (args);
 }
 
   return (args);
 }
 

-static char **add_option(char **args, size_t * argslen, size_t * argsmax,
+static char **add_option(const char **args, size_t * argslen, size_t * argsmax,

                          const char *s)
 {
     if (*argslen == *argsmax) {
                          const char *s)
 {
     if (*argslen == *argsmax) {