mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-18 06:59:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

stringop.c: rewrite strip_whitespace

Browse source
This commit is contained in:
Ian Fan 2018-12-09 11:52:55 +00:00
parent 3b4cf3718b
commit 967566e37f
5 changed files with 17 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sway/commands.c
View file

@ -236,15 +236,15 @@ list_t *execute_command(char *_exec, struct sway_seat *seat,
criteria_destroy(criteria);
config->handler_context.using_criteria = true;
// Skip leading whitespace
head += strspn(head, whitespace);
for (; isspace(*head); ++head) {}
}
// Split command list
cmdlist = argsep(&head, ";");
cmdlist += strspn(cmdlist, whitespace);
for (; isspace(*cmdlist); ++cmdlist) {}
do {
// Split commands
cmd = argsep(&cmdlist, ",");
cmd += strspn(cmd, whitespace);
for (; isspace(*cmd); ++cmd) {}
if (strcmp(cmd, "") == 0) {
wlr_log(WLR_INFO, "Ignoring empty command.");
continue;

4
sway/config.c
View file

@ -580,7 +580,7 @@ static int detect_brace_on_following_line(FILE *file, char *line,
free(peeked);
peeked = peek_line(file, lines, &position);
if (peeked) {
peeked = strip_whitespace(peeked);
strip_whitespace(peeked);
}
lines++;
} while (peeked && strlen(peeked) == 0);
@ -663,7 +663,7 @@ bool read_config(FILE *file, struct sway_config *config,
read += length + 1;
}
line = strip_whitespace(line);
strip_whitespace(line);
if (line[0] == '#') {
free(line);
continue;

2
sway/input/input-manager.c
View file

@ -49,7 +49,7 @@ char *input_device_get_identifier(struct wlr_input_device *device) {
int vendor = device->vendor;
int product = device->product;
char *name = strdup(device->name);
name = strip_whitespace(name);
strip_whitespace(name);
char *p = name;
for (; *p; ++p) {