mirror of
https://github.com/labwc/labwc.git
synced 2025-11-03 09:01:51 -05:00
common: Add additional memory utilities (xzalloc() etc.)
This commit is contained in:
parent
b89f7bfc0d
commit
cb40cdc36c
35 changed files with 193 additions and 167 deletions
10
src/action.c
10
src/action.c
|
|
@ -6,8 +6,8 @@
|
|||
#include <strings.h>
|
||||
#include <unistd.h>
|
||||
#include <wlr/util/log.h>
|
||||
#include "common/mem.h"
|
||||
#include "common/spawn.h"
|
||||
#include "common/zfree.h"
|
||||
#include "debug.h"
|
||||
#include "labwc.h"
|
||||
#include "menu/menu.h"
|
||||
|
|
@ -105,7 +105,7 @@ action_create(const char *action_name)
|
|||
wlr_log(WLR_ERROR, "action name not specified");
|
||||
return NULL;
|
||||
}
|
||||
struct action *action = calloc(1, sizeof(struct action));
|
||||
struct action *action = xzalloc(sizeof(struct action));
|
||||
action->type = action_type_from_str(action_name);
|
||||
wl_list_init(&action->args);
|
||||
return action;
|
||||
|
|
@ -372,11 +372,11 @@ void
|
|||
action_arg_add_str(struct action *action, char *key, const char *value)
|
||||
{
|
||||
assert(value && "Tried to add NULL action string argument");
|
||||
struct action_arg_str *arg = calloc(1, sizeof(*arg));
|
||||
struct action_arg_str *arg = xzalloc(sizeof(*arg));
|
||||
arg->base.type = LAB_ACTION_ARG_STR;
|
||||
if (key) {
|
||||
arg->base.key = strdup(key);
|
||||
arg->base.key = xstrdup(key);
|
||||
}
|
||||
arg->value = strdup(value);
|
||||
arg->value = xstrdup(value);
|
||||
wl_list_insert(action->args.prev, &arg->base.link);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue