From: Richard Russon <rich@flatcap.org>
Date: Tue, 30 May 2017 17:24:11 +0000 (+0100)
Subject: fix safe_calloc args
X-Git-Tag: neomutt-20170602~1^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb3d6748d9f58859b30da1d9f66219cd0cd76804;p=neomutt

fix safe_calloc args
---

diff --git a/curs_lib.c b/curs_lib.c
index 545af1cc6..6675f6d8e 100644
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -601,12 +601,12 @@ out:
 
 void mutt_init_windows(void)
 {
-  MuttHelpWindow = safe_calloc(sizeof(struct MuttWindow), 1);
-  MuttIndexWindow = safe_calloc(sizeof(struct MuttWindow), 1);
-  MuttStatusWindow = safe_calloc(sizeof(struct MuttWindow), 1);
-  MuttMessageWindow = safe_calloc(sizeof(struct MuttWindow), 1);
+  MuttHelpWindow = safe_calloc(1, sizeof(struct MuttWindow));
+  MuttIndexWindow = safe_calloc(1, sizeof(struct MuttWindow));
+  MuttStatusWindow = safe_calloc(1, sizeof(struct MuttWindow));
+  MuttMessageWindow = safe_calloc(1, sizeof(struct MuttWindow));
 #ifdef USE_SIDEBAR
-  MuttSidebarWindow = safe_calloc(sizeof(struct MuttWindow), 1);
+  MuttSidebarWindow = safe_calloc(1, sizeof(struct MuttWindow));
 #endif
 }
 
diff --git a/mh.c b/mh.c
index 885413b40..9759debbe 100644
--- a/mh.c
+++ b/mh.c
@@ -843,7 +843,7 @@ static int maildir_parse_dir(struct Context *ctx, struct Maildir ***last,
     else
       h->path = safe_strdup(de->d_name);
 
-    entry = safe_calloc(sizeof(struct Maildir), 1);
+    entry = safe_calloc(1, sizeof(struct Maildir));
     entry->h = h;
     entry->inode = de->d_ino;
     **last = entry;
@@ -1238,7 +1238,7 @@ static int mh_read_dir(struct Context *ctx, const char *subdir)
 
   if (!ctx->data)
   {
-    ctx->data = safe_calloc(sizeof(struct MhData), 1);
+    ctx->data = safe_calloc(1, sizeof(struct MhData));
   }
   data = mh_data(ctx);
 
diff --git a/muttlib.c b/muttlib.c
index bed0d556d..d177fe329 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -2029,9 +2029,9 @@ const char *mutt_make_version(void)
 
 struct Regex *mutt_compile_regexp(const char *s, int flags)
 {
-  struct Regex *pp = safe_calloc(sizeof(struct Regex), 1);
+  struct Regex *pp = safe_calloc(1, sizeof(struct Regex));
   pp->pattern = safe_strdup(s);
-  pp->rx = safe_calloc(sizeof(regex_t), 1);
+  pp->rx = safe_calloc(1, sizeof(regex_t));
   if (REGCOMP(pp->rx, NONULL(s), flags) != 0)
     mutt_free_regexp(&pp);
 
diff --git a/ncrypt/gnupgparse.c b/ncrypt/gnupgparse.c
index aea1423bb..34f61d10e 100644
--- a/ncrypt/gnupgparse.c
+++ b/ncrypt/gnupgparse.c
@@ -304,7 +304,7 @@ static struct PgpKeyInfo *parse_pub_line(char *buf, int *is_subkey, struct PgpKe
 
         mutt_debug(2, "user ID: %s\n", NONULL(p));
 
-        uid = safe_calloc(sizeof(struct PgpUid), 1);
+        uid = safe_calloc(1, sizeof(struct PgpUid));
         fix_uid(p);
         uid->addr = safe_strdup(p);
         uid->trust = trust;
diff --git a/pgppubring.c b/pgppubring.c
index 750568db2..f873151eb 100644
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -685,7 +685,7 @@ static struct PgpKeyInfo *pgp_parse_keyblock(FILE *fp)
       {
         if (lsig)
         {
-          struct PgpSignature *signature = safe_calloc(sizeof(struct PgpSignature), 1);
+          struct PgpSignature *signature = safe_calloc(1, sizeof(struct PgpSignature));
           *lsig = signature;
           lsig = &signature->next;
 
diff --git a/remailer.c b/remailer.c
index 57590b71c..6c67af629 100644
--- a/remailer.c
+++ b/remailer.c
@@ -474,7 +474,7 @@ void mix_make_chain(struct List **chainp)
     return;
   }
 
-  chain = safe_calloc(sizeof(struct MixChain), 1);
+  chain = safe_calloc(1, sizeof(struct MixChain));
   for (p = *chainp; p; p = p->next)
     mix_chain_add(chain, (char *) p->data, type2_list);
 
diff --git a/rfc2231.c b/rfc2231.c
index 99c107136..cd1ad00f8 100644
--- a/rfc2231.c
+++ b/rfc2231.c
@@ -109,7 +109,7 @@ static void rfc2231_decode_one(char *dest, char *src)
 
 static struct Rfc2231Parameter *rfc2231_new_parameter(void)
 {
-  return safe_calloc(sizeof(struct Rfc2231Parameter), 1);
+  return safe_calloc(1, sizeof(struct Rfc2231Parameter));
 }
 
 /* insert parameter into an ordered list.