aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Roberts <william.c.roberts@intel.com>2017-10-17 11:16:23 -0700
committerJason Zaman <jason@perfinion.com>2017-10-29 20:59:50 +0800
commit9303a33ab384c0af2ad5e90e6491dc330e3e5a01 (patch)
treea8090cb569c4daed16d39d6921bfdf98740c08a8 /support
parentfiles, init, sysnetwork, systemd: Module version bumps. (diff)
downloadhardened-refpolicy-9303a33ab384c0af2ad5e90e6491dc330e3e5a01.tar.gz
hardened-refpolicy-9303a33ab384c0af2ad5e90e6491dc330e3e5a01.tar.bz2
hardened-refpolicy-9303a33ab384c0af2ad5e90e6491dc330e3e5a01.zip
fc_sort: use calloc instead of malloc
Rather than using malloc to allocated nodes and setting all the fields, just use calloc. Signed-off-by: William Roberts <william.c.roberts@intel.com>
Diffstat (limited to 'support')
-rw-r--r--support/fc_sort.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/support/fc_sort.c b/support/fc_sort.c
index 956c37b8f..bfe28ca8d 100644
--- a/support/fc_sort.c
+++ b/support/fc_sort.c
@@ -357,15 +357,11 @@ int main(int argc, char *argv[])
}
/* Initialize the head of the linked list. */
- head = current = (file_context_node_t*)malloc(sizeof(file_context_node_t));
+ head = current = (file_context_node_t*)calloc(1, sizeof(file_context_node_t));
if (!head) {
fprintf(stderr, "Error: failure allocating memory.\n");
return 1;
}
- head->next = NULL;
- head->path = NULL;
- head->file_type = NULL;
- head->context = NULL;
/* Parse the file into a file_context linked list. */
line_buf = NULL;
@@ -390,15 +386,13 @@ int main(int argc, char *argv[])
continue;
/* We have a valid line - allocate a new node. */
- temp = (file_context_node_t *)malloc(sizeof(file_context_node_t));
+ temp = (file_context_node_t *)calloc(1, sizeof(file_context_node_t));
if (!temp) {
free(line_buf);
fprintf(stderr, "Error: failure allocating memory.\n");
fc_free_file_context_node_list(head);
return 1;
}
- temp->next = NULL;
- memset(temp, 0, sizeof(file_context_node_t));
/* Parse out the regular expression from the line. */
start = i;