narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove some unnecessary use of calloc() for tiny memory areas.

pull/1/head
Michael Brown 2006-12-18 21:11:30 +00:00
parent ba26defa6e
commit 1f74fa2cad
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/hci/mucurses/slk.c
View File

@ -19,7 +19,7 @@ struct _softlabel {
1: centre justify 1: centre justify
2: right justify 2: right justify
*/ */
unsigned short fmt; unsigned int fmt;
}; };
struct _softlabelkeys { struct _softlabelkeys {
@ -31,12 +31,12 @@ struct _softlabelkeys {
2: 4-4-4 2: 4-4-4
3: 4-4-4 with index line 3: 4-4-4 with index line
*/ */
unsigned short fmt; unsigned int fmt;
unsigned short max_label_len; unsigned int max_label_len;
unsigned short maj_space_len; unsigned int maj_space_len;
unsigned short num_labels; unsigned int num_labels;
unsigned short num_spaces; unsigned int num_spaces;
unsigned short *spaces; unsigned int spaces[2];
}; };
struct _softlabelkeys *slks; struct _softlabelkeys *slks;
@ -236,19 +236,16 @@ int slk_init ( int fmt ) {
switch(fmt) { switch(fmt) {
case 0: case 0:
nblocks = 8; nmaj = 2; nmin = 5; nblocks = 8; nmaj = 2; nmin = 5;
slks->spaces = calloc(2, sizeof(unsigned short));
slks->spaces[0] = 2; slks->spaces[1] = 4; slks->spaces[0] = 2; slks->spaces[1] = 4;
break; break;
case 1: case 1:
nblocks = 8; nmaj = 1; nmin = 6; nblocks = 8; nmaj = 1; nmin = 6;
slks->spaces = calloc(1, sizeof(unsigned short));
slks->spaces[0] = 3; slks->spaces[0] = 3;
break; break;
case 2: case 2:
// same allocations as format 3 // same allocations as format 3
case 3: case 3:
nblocks = 12; nmaj = 2; nmin = 9; nblocks = 12; nmaj = 2; nmin = 9;
slks->spaces = calloc(2, sizeof(unsigned short));
slks->spaces[0] = 3; slks->spaces[1] = 7; slks->spaces[0] = 3; slks->spaces[1] = 7;
break; break;
default: default:
@ -290,7 +287,7 @@ char* slk_label ( int labnum ) {
* @ret rc return status code * @ret rc return status code
*/ */
int slk_restore ( void ) { int slk_restore ( void ) {
unsigned short i, j, unsigned int i, j,
*next_space, *last_space; *next_space, *last_space;
chtype space_ch; chtype space_ch;