diff options
| author | sabetts <sabetts> | 2006-09-27 01:00:45 +0000 |
|---|---|---|
| committer | sabetts <sabetts> | 2006-09-27 01:00:45 +0000 |
| commit | b80a2d14bf72a4758eca46156a7c3ad606473bb7 (patch) | |
| tree | 7a86b490490b7c947d331c02e618c07d5239db18 /src/frame.c | |
| parent | ad859c2d9b0f19ff55ea016d23a97853ef99b89e (diff) | |
| download | ratpoison-b80a2d14bf72a4758eca46156a7c3ad606473bb7.zip | |
*** empty log message ***
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/frame.c b/src/frame.c index 3a6b82e..9328326 100644 --- a/src/frame.c +++ b/src/frame.c @@ -190,7 +190,7 @@ frame_dump (rp_frame *frame, rp_screen *screen) } /* Used only by frame_read */ -#define read_slot(x) do { tmp = strtok (NULL, " "); x = strtol(tmp,NULL,10); } while(0) +#define read_slot(x) do { tmp = strtok_ws (NULL); x = strtol(tmp,NULL,10); } while(0) rp_frame * frame_read (char *str, rp_screen *screen) @@ -209,7 +209,7 @@ frame_read (char *str, rp_screen *screen) PRINT_DEBUG(("parsing '%s'\n", str)); dup = xstrdup(str); - tmp = strtok (dup, " "); + tmp = strtok_ws (dup); /* Verify it starts with '(frame ' */ if (strcmp(tmp, "(frame")) @@ -220,7 +220,7 @@ frame_read (char *str, rp_screen *screen) return NULL; } /* NOTE: there is no check to make sure each field was filled in. */ - tmp = strtok(NULL, " "); + tmp = strtok_ws(NULL); while (tmp) { if (!strcmp(tmp, ":number")) @@ -256,7 +256,7 @@ frame_read (char *str, rp_screen *screen) else PRINT_ERROR(("Unknown slot %s\n", tmp)); /* Read the next token. */ - tmp = strtok(NULL, " "); + tmp = strtok_ws(NULL); } if (tmp) PRINT_ERROR(("Frame has trailing garbage\n")); |