From 3db0dc3d8d95324b7c2da84ba15f633f911124fc Mon Sep 17 00:00:00 2001
From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Sun, 12 Jun 2005 15:24:36 +0000
Subject: [PATCH] add macro charset(), a wrapper that calls memset(), and use
 it in resize_variables()

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2627 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
 ChangeLog  | 5 +++--
 src/nano.c | 2 +-
 src/nano.h | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 50dcfd63..785f9f7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -119,8 +119,7 @@ CVS code -
 	- If the current filestruct's been partitioned, unpartition it
 	  before saving the associated file. (DLR)
   resize_variables()
-	- Use sizeof(char) in the memset() that initializes hblank
-	  instead of assuming that the size of a char is 1. (DLR)
+	- Use charset() instead of memset() to initialize hblank. (DLR)
   copy_filestruct()
 	- Rename variable prev to copy to avoid confusion. (DLR)
   print1opt_full()
@@ -142,6 +141,8 @@ CVS code -
   disable_extended_input()
 	- Disable extended output processing as well as extended input
 	  processing, and rename to disable_extended_io(). (DLR)
+- nano.h:
+	- Add macro charset(), a wrapper that calls memset(). (DLR)
 - rcfile.c:
   color_to_int()
 	- Since colorname's being NULL is handled elsewhere now, assert
diff --git a/src/nano.c b/src/nano.c
index f7fdb894..0a46a430 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -212,7 +212,7 @@ void resize_variables(void)
 #endif
 
     hblank = charealloc(hblank, COLS + 1);
-    memset(hblank, ' ', COLS * sizeof(char));
+    charset(hblank, ' ', COLS);
     hblank[COLS] = '\0';
 }
 
diff --git a/src/nano.h b/src/nano.h
index 4997bb0e..1513f5b3 100644
--- a/src/nano.h
+++ b/src/nano.h
@@ -45,11 +45,12 @@
 #define ISSET(bit) ((flags & bit) != 0)
 #define TOGGLE(bit) flags ^= bit
 
-/* Macros for character allocation. */
+/* Macros for character allocation, etc. */
 #define charalloc(howmuch) (char *)nmalloc((howmuch) * sizeof(char))
 #define charealloc(ptr, howmuch) (char *)nrealloc(ptr, (howmuch) * sizeof(char))
 #define charmove(dest, src, n) memmove(dest, src, (n) * sizeof(char))
 #define charcpy(dest, src, n) memcpy(dest, src, (n) * sizeof(char))
+#define charset(dest, src, n) memset(dest, src, (n) * sizeof(char))
 
 /* Other macros. */
 #ifdef BROKEN_REGEXEC
-- 
2.39.5