From: John Hodge <tpg@mutabah.net>
Date: Sat, 10 May 2014 02:46:02 +0000 (+0800)
Subject: Modules/Keyboard - (minor) Clean up instance allocation
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=721b84c825f9261526d7aa56f1ac812a56f8bd8f;hp=433fc48ffc7f0fc337a704e4f2f4f4390de60f70;p=tpg%2Facess2.git

Modules/Keyboard - (minor) Clean up instance allocation
---

diff --git a/KernelLand/Modules/Input/Keyboard/main.c b/KernelLand/Modules/Input/Keyboard/main.c
index 377ae309..32688df2 100644
--- a/KernelLand/Modules/Input/Keyboard/main.c
+++ b/KernelLand/Modules/Input/Keyboard/main.c
@@ -117,19 +117,16 @@ int Keyboard_IOCtl(tVFS_Node *Node, int Id, void *Data)
  */
 tKeyboard *Keyboard_CreateInstance(int MaxSym, const char *Name)
 {
-	tKeyboard	*ret;
-	 int	sym_bitmap_size = (MaxSym + 7)/8;
-	 int	string_size = strlen(Name) + 1;
+	size_t	sym_bitmap_size = (MaxSym + 7)/8;
+	size_t	string_size = strlen(Name) + 1;
 
-	ret = malloc( sizeof(tKeyboard) + sym_bitmap_size + string_size );
+	tKeyboard *ret = calloc( 1, sizeof(tKeyboard) + sym_bitmap_size + string_size );
 	if( !ret ) {
 		return NULL;
 	}
-	// Clear
-	memset(ret, 0, sizeof(tKeyboard) + sym_bitmap_size );
 	// Set name
-	ret->Name = (char*)ret + sizeof(tKeyboard) + sym_bitmap_size;
-	memcpy(ret->Name, Name, string_size);
+	ret->Name = (char*)( &ret->KeyStates[sym_bitmap_size] );
+	strcpy(ret->Name, Name);
 	// Set node and default keymap
 	ret->Node = &gKB_DevInfo.RootNode;
 	ret->Keymap = &gKeymap_KBDUS;