pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

modules: use calloc() instead of malloc()

Browse source 
In cases where it makes sense, use calloc() instead of malloc():

* When allocating large objects with many members, many for which
  NULL/0 is a good default value.
* Arrays etc where we explicitly initialize to NULL anyway.
This commit is contained in:
Daniel Eklöf 2019-02-09 11:11:31 +01:00
parent 6bba9200cf
commit b6e61f9c7e
11 changed files with 12 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/i3.c
View file

@ -248,7 +248,7 @@ handle_get_workspaces_reply(struct private *m, const struct json_object *json)
size_t count = json_object_array_length(json);
m->workspaces.count = count;
m->workspaces.v = malloc(count * sizeof(m->workspaces.v[0]));
m->workspaces.v = calloc(count, sizeof(m->workspaces.v[0]));
for (size_t i = 0; i < count; i++) {
if (!workspace_from_json(
@ -709,7 +709,7 @@ static struct module *
i3_new(struct i3_workspaces workspaces[], size_t workspace_count,
int left_spacing, int right_spacing)
{
struct private *m = malloc(sizeof(*m));
struct private *m = calloc(1, sizeof(*m));
m->left_spacing = left_spacing;
m->right_spacing = right_spacing;
@ -722,9 +722,6 @@ i3_new(struct i3_workspaces workspaces[], size_t workspace_count,
m->ws_content.v[i].content = workspaces[i].content;
}
m->workspaces.v = NULL;
m->workspaces.count = 0;
struct module *mod = module_common_new();
mod->private = m;
mod->run = &run;