From 9ae28f4b74d896f4cf9000e2e747ba84005a3ebd Mon Sep 17 00:00:00 2001
From: Ben Kibbey <bjk@luxsci.net>
Date: Thu, 22 Sep 2016 19:45:20 -0400
Subject: [PATCH] s/uint32_t/unsigned.

---
 src/commands.c | 10 +++++-----
 src/common.h   |  4 ++--
 src/crypto.h   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/commands.c b/src/commands.c
index fe8a2f19..c470d838 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -85,7 +85,7 @@ struct command_table_s
   const char *help;
   int ignore_startup;
   int unlock;			// unlock the file mutex after validating the checksum
-  uint32_t flock_type;
+  unsigned flock_type;
 };
 
 static struct command_table_s **command_table;
@@ -442,8 +442,8 @@ open_command (assuan_context_t ctx, char *line)
   if (client->flags & FLAG_OPEN ||
       (client->flags & FLAG_HAS_LOCK && !same_file))
     {
-      uint32_t opts = client->opts;
-      uint32_t flags = client->flags;
+      unsigned opts = client->opts;
+      unsigned flags = client->flags;
 
       if (same_file)
 	client->flags |= FLAG_KEEP_LOCK;
@@ -779,7 +779,7 @@ parse_save_opt_sign_keyid (void *data, void *value)
 }
 
 static gpg_error_t
-parse_save_opt_inquire (struct client_s *client, uint32_t opt)
+parse_save_opt_inquire (struct client_s *client, unsigned opt)
 {
   if (opt == OPT_INQUIRE && !(client->flags & FLAG_NEW))
     {
@@ -853,7 +853,7 @@ compare_keys (char **new_keys, char **old_keys)
 }
 
 static gpg_error_t
-inquire_keyid (struct client_s *client, uint32_t opt)
+inquire_keyid (struct client_s *client, unsigned opt)
 {
   gpg_error_t rc;
   unsigned char *result = NULL;
diff --git a/src/common.h b/src/common.h
index ce7a5f03..b674e874 100644
--- a/src/common.h
+++ b/src/common.h
@@ -95,8 +95,8 @@ struct client_s
   char *filename;
   struct client_thread_s *thd;
   struct crypto_s *crypto;
-  uint32_t opts;
-  uint32_t flags;
+  unsigned opts;
+  unsigned flags;
   char *import_root;
   long lock_timeout;		/* In tenths of a second. */
   gpg_error_t last_rc;
diff --git a/src/crypto.h b/src/crypto.h
index 9bb86a1c..7c4dfc00 100644
--- a/src/crypto.h
+++ b/src/crypto.h
@@ -62,7 +62,7 @@ struct crypto_s
   struct save_s save;
   gpg_error_t progress_rc;
   time_t status_timeout;
-  uint32_t flags;
+  unsigned flags;
   char *keyfile;
 };
 
-- 
2.11.4.GIT