[gentoo-commits] proj/hardened-refpolicy:master commit in: support/

[Jason Zaman]

commit:     9303a33ab384c0af2ad5e90e6491dc330e3e5a01
Author:     William Roberts <william.c.roberts <AT> intel <DOT> com>
AuthorDate: Tue Oct 17 18:16:23 2017 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Oct 29 12:59:50 2017 +0000
URL:        
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=9303a33a

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 <AT> intel.com>

 support/fc_sort.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/support/fc_sort.c b/support/fc_sort.c
index 956c37b8..bfe28ca8 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;