Index: aicasm.c
===================================================================
RCS file: /cvs/src/sys/dev/microcode/aic7xxx/aicasm.c,v
retrieving revision 1.15
diff -u -p -r1.15 aicasm.c
--- aicasm.c 5 Dec 2012 23:20:19 -0000 1.15
+++ aicasm.c 31 May 2014 11:01:21 -0000
@@ -500,12 +500,10 @@ emit_patch(scope_t *scope, int patch)
/* No-Op patch */
return;
- new_patch = (patch_t *)malloc(sizeof(*new_patch));
+ new_patch = calloc(1, sizeof(*new_patch));
if (new_patch == NULL)
- stop("Could not malloc patch structure", EX_OSERR);
-
- memset(new_patch, 0, sizeof(*new_patch));
+ stop("Could not calloc patch structure", EX_OSERR);
if (patch == 0) {
new_patch->patch_func = scope->func_num;
@@ -737,10 +735,9 @@ seq_alloc()
{
struct instruction *new_instr;
- new_instr = (struct instruction *)malloc(sizeof(struct instruction));
+ new_instr = calloc(1, sizeof(struct instruction));
if (new_instr == NULL)
- stop("Unable to malloc instruction object", EX_SOFTWARE);
- memset(new_instr, 0, sizeof(*new_instr));
+ stop("Unable to calloc instruction object", EX_SOFTWARE);
TAILQ_INSERT_TAIL(&seq_program, new_instr, links);
new_instr->srcline = yylineno;
return new_instr;
@@ -751,10 +748,9 @@ cs_alloc()
{
critical_section_t *new_cs;
- new_cs= (critical_section_t *)malloc(sizeof(critical_section_t));
+ new_cs = calloc(1, sizeof(critical_section_t));
if (new_cs == NULL)
- stop("Unable to malloc critical_section object", EX_SOFTWARE);
- memset(new_cs, 0, sizeof(*new_cs));
+ stop("Unable to calloc critical_section object", EX_SOFTWARE);
TAILQ_INSERT_TAIL(&cs_tailq, new_cs, links);
return new_cs;
@@ -765,10 +761,9 @@ scope_alloc()
{
scope_t *new_scope;
- new_scope = (scope_t *)malloc(sizeof(scope_t));
+ new_scope = calloc(1, sizeof(scope_t));
if (new_scope == NULL)
- stop("Unable to malloc scope object", EX_SOFTWARE);
- memset(new_scope, 0, sizeof(*new_scope));
+ stop("Unable to calloc scope object", EX_SOFTWARE);
TAILQ_INIT(&new_scope->inner_scope);
if (SLIST_FIRST(&scope_stack) != NULL) {
Index: aicasm_symbol.c
===================================================================
RCS file: /cvs/src/sys/dev/microcode/aic7xxx/aicasm_symbol.c,v
retrieving revision 1.11
diff -u -p -r1.11 aicasm_symbol.c
--- aicasm_symbol.c 5 Dec 2012 23:20:19 -0000 1.11
+++ aicasm_symbol.c 31 May 2014 11:01:21 -0000
@@ -68,12 +68,11 @@ symbol_create(char *name)
{
symbol_t *new_symbol;
- new_symbol = (symbol_t *)malloc(sizeof(symbol_t));
+ new_symbol = calloc(1, sizeof(symbol_t));
if (new_symbol == NULL) {
perror("Unable to create new symbol");
exit(EX_SOFTWARE);
}
- memset(new_symbol, 0, sizeof(*new_symbol));
new_symbol->name = strdup(name);
if (new_symbol->name == NULL)
stop("Unable to strdup symbol name", EX_SOFTWARE);
