From: Richard Russon <rich@flatcap.org>
Date: Wed, 1 Nov 2017 02:29:43 +0000 (+0000)
Subject: fix plain unsigned
X-Git-Tag: neomutt-20171208~59^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=574826250d8e278aa32bef87d8dcca670cd1bd84;p=neomutt

fix plain unsigned

Be specific.  Replace `unsigned` with `unsigned int`.
---

diff --git a/conn/sasl.c b/conn/sasl.c
index 99fcca1b6..c1c7fa75f 100644
--- a/conn/sasl.c
+++ b/conn/sasl.c
@@ -138,7 +138,8 @@ static int getnameinfo_err(int ret)
  *
  * utility function, copied from sasl2 sample code
  */
-static int iptostring(const struct sockaddr *addr, socklen_t addrlen, char *out, unsigned outlen)
+static int iptostring(const struct sockaddr *addr, socklen_t addrlen, char *out,
+                      unsigned int outlen)
 {
   char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
   int ret;
@@ -223,7 +224,7 @@ static int mutt_sasl_start(void)
  * @param[out] len     Length of result
  * @retval int SASL error code, e.g. SASL_FAIL
  */
-static int mutt_sasl_cb_authname(void *context, int id, const char **result, unsigned *len)
+static int mutt_sasl_cb_authname(void *context, int id, const char **result, unsigned int *len)
 {
   struct Account *account = (struct Account *) context;
 
diff --git a/hcache/hcache.c b/hcache/hcache.c
index 098150406..1e2d02d43 100644
--- a/hcache/hcache.c
+++ b/hcache/hcache.c
@@ -170,8 +170,8 @@ static void restore_int(unsigned int *i, const unsigned char *d, int *off)
 
 static inline bool is_ascii(const char *p, size_t len)
 {
-  register const char *s = p;
-  while (s && (unsigned) (s - p) < len)
+  const char *s = p;
+  while (s && (unsigned int) (s - p) < len)
   {
     if ((*s & 0x80) != 0)
       return false;
diff --git a/mh.c b/mh.c
index 5bbd75a95..32e9085dc 100644
--- a/mh.c
+++ b/mh.c
@@ -75,7 +75,7 @@ struct Maildir
 {
   struct Header *h;
   char *canon_fname;
-  unsigned header_parsed : 1;
+  bool header_parsed : 1;
   ino_t inode;
   struct Maildir *next;
 };
diff --git a/mutt_notmuch.c b/mutt_notmuch.c
index eff01e2fb..9406d0735 100644
--- a/mutt_notmuch.c
+++ b/mutt_notmuch.c
@@ -925,7 +925,7 @@ static void progress_update(struct Context *ctx, notmuch_query_t *q)
 
   if (!data->progress_ready && q)
   {
-    unsigned count;
+    unsigned int count;
     static char msg[STRING];
     snprintf(msg, sizeof(msg), _("Reading messages..."));
 
@@ -1513,7 +1513,7 @@ done:
 
 static unsigned int count_query(notmuch_database_t *db, const char *qstr)
 {
-  unsigned res = 0;
+  unsigned int res = 0;
   notmuch_query_t *q = notmuch_query_create(db, qstr);
 
   if (q)