From 9fdb7e1f4dadd7996d614b9cab95704fa22cf0d5 Mon Sep 17 00:00:00 2001
From: christos <christos>
Date: Fri, 15 Jan 2016 15:28:57 +0000
Subject: [PATCH 1/2] PR/510: Masanarid Iida: Add missing paren (in debugging
 code)

---
 ed.defns.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ed.defns.c b/ed.defns.c
index 60ef193..a472e66 100644
--- a/ed.defns.c
+++ b/ed.defns.c
@@ -1805,7 +1805,7 @@ CheckMaps(void)
 
     if ((sizeof(CcKeyMap)) != c1)
 	xprintf("CcKeyMap should be %d entries, but is %d.\r\n",
-		NT_NUM_KEYS, sizeof(CcKeyMap) / sizeof(KEYCMD)));
+		NT_NUM_KEYS, (sizeof(CcKeyMap) / sizeof(KEYCMD)));
 
     if ((sizeof(CcAltMap)) != c1)
 	xprintf("CcAltMap should be %d entries, but is %d.\r\n",
-- 
2.5.5


From 3512c94faa44497e27959da78814777bdf8e0491 Mon Sep 17 00:00:00 2001
From: christos <christos>
Date: Sun, 14 Feb 2016 15:44:18 +0000
Subject: [PATCH 2/2] PR/510: Masanari Iida: Fix debugging printfs.

---
 ed.defns.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/ed.defns.c b/ed.defns.c
index a472e66..a4ed6a0 100644
--- a/ed.defns.c
+++ b/ed.defns.c
@@ -1801,27 +1801,27 @@ editinit(void)
 void
 CheckMaps(void)
 {		/* check the size of the key maps */
-    int     c1 = (NT_NUM_KEYS * sizeof(KEYCMD));
+    size_t     c1 = NT_NUM_KEYS * sizeof(KEYCMD);
 
-    if ((sizeof(CcKeyMap)) != c1)
-	xprintf("CcKeyMap should be %d entries, but is %d.\r\n",
-		NT_NUM_KEYS, (sizeof(CcKeyMap) / sizeof(KEYCMD)));
+    if (sizeof(CcKeyMap) != c1)
+	xprintf("CcKeyMap should be %u entries, but is %zu.\r\n",
+		NT_NUM_KEYS, sizeof(CcKeyMap) / sizeof(KEYCMD));
 
-    if ((sizeof(CcAltMap)) != c1)
-	xprintf("CcAltMap should be %d entries, but is %d.\r\n",
-		NT_NUM_KEYS, (sizeof(CcAltMap) / sizeof(KEYCMD)));
+    if (sizeof(CcAltMap) != c1)
+	xprintf("CcAltMap should be %u entries, but is %zu.\r\n",
+		NT_NUM_KEYS, sizeof(CcAltMap) / sizeof(KEYCMD));
 
-    if ((sizeof(CcEmacsMap)) != c1)
-	xprintf("CcEmacsMap should be %d entries, but is %d.\r\n",
-		NT_NUM_KEYS, (sizeof(CcEmacsMap) / sizeof(KEYCMD)));
+    if (sizeof(CcEmacsMap) != c1)
+	xprintf("CcEmacsMap should be %u entries, but is %zu.\r\n",
+		NT_NUM_KEYS, sizeof(CcEmacsMap) / sizeof(KEYCMD));
 
-    if ((sizeof(CcViMap)) != c1)
-	xprintf("CcViMap should be %d entries, but is %d.\r\n",
-		NT_NUM_KEYS, (sizeof(CcViMap) / sizeof(KEYCMD)));
+    if (sizeof(CcViMap) != c1)
+	xprintf("CcViMap should be %u entries, but is %zu.\r\n",
+		NT_NUM_KEYS, sizeof(CcViMap) / sizeof(KEYCMD));
 
-    if ((sizeof(CcViCmdMap)) != c1)
-	xprintf("CcViCmdMap should be %d entries, but is %d.\r\n",
-		NT_NUM_KEYS, (sizeof(CcViCmdMap) / sizeof(KEYCMD)));
+    if (sizeof(CcViCmdMap) != c1)
+	xprintf("CcViCmdMap should be %u entries, but is %zu.\r\n",
+		NT_NUM_KEYS, sizeof(CcViCmdMap) / sizeof(KEYCMD));
 }
 
 #endif
-- 
2.5.5