git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modules/Keyboard - (minor) Clean up instance allocation
[tpg/acess2.git]
/
KernelLand
/
Modules
/
Input
/
Keyboard
/
main.c
diff --git
a/KernelLand/Modules/Input/Keyboard/main.c
b/KernelLand/Modules/Input/Keyboard/main.c
index
377ae30
..
32688df
100644
(file)
--- 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 *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;
}
if( !ret ) {
return NULL;
}
- // Clear
- memset(ret, 0, sizeof(tKeyboard) + sym_bitmap_size );
// Set name
// Set name
- ret->Name = (char*)
ret + sizeof(tKeyboard) + sym_bitmap_size
;
-
memcpy(ret->Name, Name, string_siz
e);
+ ret->Name = (char*)
( &ret->KeyStates[sym_bitmap_size] )
;
+
strcpy(ret->Name, Nam
e);
// Set node and default keymap
ret->Node = &gKB_DevInfo.RootNode;
ret->Keymap = &gKeymap_KBDUS;
// Set node and default keymap
ret->Node = &gKB_DevInfo.RootNode;
ret->Keymap = &gKeymap_KBDUS;
UCC
git Repository :: git.ucc.asn.au