Hi,
this seems to be the really last patch regarding `strtok in framebuffer
drivers'. It removes another compiler warning, converts the last three
strtok()s to strsep()s and in two cases adds `skip empty tokens'-code.
Please, apply.
Ren?
diff -Nur linux-2.4.15-pre5/drivers/video/atafb.c linux-2.4.15-pre5-rs/drivers/video/atafb.c
--- linux-2.4.15-pre5/drivers/video/atafb.c Fri Sep 14 01:04:43 2001
+++ linux-2.4.15-pre5-rs/drivers/video/atafb.c Fri Nov 16 20:21:39 2001
@@ -2899,7 +2899,7 @@
if (!options || !*options)
return 0;
- for(this_opt=strtok(options,","); this_opt; this_opt=strtok(NULL,",")) {
+ while ((this_opt = strsep(&options, ",")) != NULL) {
if (!*this_opt) continue;
if ((temp=get_video_mode(this_opt)))
default_par=temp;
diff -Nur linux-2.4.15-pre5/drivers/video/aty/atyfb_base.c linux-2.4.15-pre5-rs/drivers/video/aty/atyfb_base.c
--- linux-2.4.15-pre5/drivers/video/aty/atyfb_base.c Thu Nov 8 22:51:16 2001
+++ linux-2.4.15-pre5-rs/drivers/video/aty/atyfb_base.c Fri Nov 16 20:10:21 2001
@@ -2522,6 +2522,8 @@
return 0;
while ((this_opt = strsep(&options, ",")) != NULL) {
+ if (!*this_opt)
+ continue;
if (!strncmp(this_opt, "font:", 5)) {
char *p;
int i;
diff -Nur linux-2.4.15-pre5/drivers/video/aty128fb.c linux-2.4.15-pre5-rs/drivers/video/aty128fb.c
--- linux-2.4.15-pre5/drivers/video/aty128fb.c Fri Nov 16 18:43:02 2001
+++ linux-2.4.15-pre5-rs/drivers/video/aty128fb.c Fri Nov 16 20:13:10 2001
@@ -1620,7 +1620,9 @@
if (!options || !*options)
return 0;
- while (this_opt = strsep(&options, ",")) {
+ while ((this_opt = strsep(&options, ",")) != NULL) {
+ if (!*this_opt)
+ continue;
if (!strncmp(this_opt, "font:", 5)) {
char *p;
int i;
diff -Nur linux-2.4.15-pre5/drivers/video/clgenfb.c linux-2.4.15-pre5-rs/drivers/video/clgenfb.c
--- linux-2.4.15-pre5/drivers/video/clgenfb.c Thu Nov 8 22:51:16 2001
+++ linux-2.4.15-pre5-rs/drivers/video/clgenfb.c Fri Nov 16 20:19:51 2001
@@ -2823,8 +2823,7 @@
if (!options || !*options)
return 0;
- for (this_opt = strtok (options, ","); this_opt != NULL;
- this_opt = strtok (NULL, ",")) {
+ while ((this_opt = strsep (&options, ",")) != NULL) {
if (!*this_opt) continue;
DPRINTK("clgenfb_setup: option '%s'\n", this_opt);
diff -Nur linux-2.4.15-pre5/drivers/video/sis/sis_main.c linux-2.4.15-pre5-rs/drivers/video/sis/sis_main.c
--- linux-2.4.15-pre5/drivers/video/sis/sis_main.c Fri Nov 16 18:43:03 2001
+++ linux-2.4.15-pre5-rs/drivers/video/sis/sis_main.c Fri Nov 16 20:19:04 2001
@@ -2257,8 +2257,7 @@
if (!options || !*options)
return 0;
- for (this_opt = strtok (options, ","); this_opt;
- this_opt = strtok (NULL, ",")) {
+ while ((this_opt = strsep (&options, ",")) != NULL) {
if (!*this_opt)
continue;