mirror of
https://github.com/swaywm/sway.git
synced 2024-11-22 07:51:28 +00:00
strdup + style
This commit is contained in:
parent
47ff000697
commit
3eb29ea736
|
@ -383,9 +383,8 @@ static bool cmd_mode(int argc, char **argv) {
|
|||
// Create mode if it doesnt exist
|
||||
if (!mode && argc >= 2 && strncmp(argv[1],"{",1) == 0) {
|
||||
mode = malloc(sizeof*mode);
|
||||
mode->name = malloc(strlen(mode_name) + 1);
|
||||
mode->name = strdup(mode_name);
|
||||
mode->bindings = create_list();
|
||||
strcpy(mode->name, mode_name);
|
||||
list_add(config->modes, mode);
|
||||
}
|
||||
if (!mode) {
|
||||
|
@ -834,10 +833,8 @@ static bool cmd_set(int argc, char **argv) {
|
|||
return false;
|
||||
}
|
||||
struct sway_variable *var = malloc(sizeof(struct sway_variable));
|
||||
var->name = malloc(strlen(argv[0]) + 1);
|
||||
strcpy(var->name, argv[0]);
|
||||
var->value = malloc(strlen(argv[1]) + 1);
|
||||
strcpy(var->value, argv[1]);
|
||||
var->name = strdup(argv[0]);
|
||||
var->value = strdup(argv[1]);
|
||||
list_add(config->symbols, var);
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -249,8 +249,7 @@ bool read_config(FILE *file, bool is_active) {
|
|||
sway_log(L_ERROR, "Invalid command during config ``%s''", line);
|
||||
} else if (handler->config_type == CMD_COMPOSITOR_READY && !is_active) {
|
||||
sway_log(L_DEBUG, "Deferring command ``%s''", line);
|
||||
char *cmd = malloc(strlen(line) + 1);
|
||||
strcpy(cmd, line);
|
||||
char *cmd = strdup(line);
|
||||
list_add(config->cmd_queue, cmd);
|
||||
} else if (!handle_command(line)) {
|
||||
sway_log(L_DEBUG, "Config load failed for line ``%s''", line);
|
||||
|
|
|
@ -17,14 +17,13 @@ char *strip_whitespace(char *_str) {
|
|||
while (*_str == ' ' || *_str == '\t') {
|
||||
_str++;
|
||||
}
|
||||
char *str = malloc(strlen(_str) + 1);
|
||||
strcpy(str, _str);
|
||||
char *str = strdup(_str);
|
||||
free(strold);
|
||||
int i;
|
||||
for (i = 0; str[i] != '\0'; ++i);
|
||||
do {
|
||||
i--;
|
||||
} while (i >= 0 && (str[i] == ' ' || str[i] == '\t'));
|
||||
} while (i >= 0 && (str[i] == ' ' || str[i] == '\t'));
|
||||
str[i + 1] = '\0';
|
||||
return str;
|
||||
}
|
||||
|
@ -76,9 +75,8 @@ void strip_quotes(char *str) {
|
|||
|
||||
list_t *split_string(const char *str, const char *delims) {
|
||||
list_t *res = create_list();
|
||||
char *copy = malloc(strlen(str) + 1);
|
||||
char *copy = strdup(str);
|
||||
char *token;
|
||||
strcpy(copy, str);
|
||||
|
||||
token = strtok(copy, delims);
|
||||
while(token) {
|
||||
|
|
Loading…
Reference in a new issue