nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'wsnum' into next

This commit is contained in:
Michael Stapelberg 2011-08-04 00:34:43 +02:00
parent 0330e868bc 837bb50826
commit 926ca651ef
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/workspace.c
View File

@ -49,12 +49,11 @@ Con *workspace_get(const char *num, bool *created) {
workspace->name = sstrdup(num); workspace->name = sstrdup(num);
/* We set ->num to the number if this workspace’s name consists only of /* We set ->num to the number if this workspace’s name consists only of
* a positive number. Otherwise it’s a named ws and num will be -1. */ * a positive number. Otherwise it’s a named ws and num will be -1. */
char *end;
long parsed_num = strtol(num, &end, 10); long parsed_num = strtol(num, NULL, 10);
if (parsed_num == LONG_MIN || if (parsed_num == LONG_MIN ||
parsed_num == LONG_MAX || parsed_num == LONG_MAX ||
parsed_num < 0 || parsed_num <= 0)
(end && *end != '\0'))
workspace->num = -1; workspace->num = -1;
else workspace->num = parsed_num; else workspace->num = parsed_num;
LOG("num = %d\n", workspace->num); LOG("num = %d\n", workspace->num);