Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rewrite to account for the fact that feof() does _not_ return TRUE on

Browse Source 
Sat Jan 22 12:40:48 2000  Owen Taylor  <otaylor@redhat.com>

	* gdk/gdkpixmap.c (gdk_pixmap_seek_string): Rewrite
	  to account for the fact that feof() does _not_
	  return TRUE on errors, and thus avoid infinite loops
	  when trying to use gdk_pixmap_create_from_xpm()
	  on unreadable values.
This commit is contained in:
Owen Taylor
2000-01-22 17:43:44 +00:00
committed by Owen Taylor
parent 25b47b88cd
commit 7c1abc5f73
8 changed files with 67 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
Sat Jan 22 12:40:48 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixmap.c (gdk_pixmap_seek_string): Rewrite
to account for the fact that feof() does _not_
return TRUE on errors, and thus avoid infinite loops
when trying to use gdk_pixmap_create_from_xpm()
on unreadable values.
Fri Jan 21 18:32:43 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkaspectframe.h (struct _GtkAspectFrame): s/gint/gboolean/.

8
ChangeLog.pre-2-0
View File

@@ -1,3 +1,11 @@
Sat Jan 22 12:40:48 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixmap.c (gdk_pixmap_seek_string): Rewrite
to account for the fact that feof() does _not_
return TRUE on errors, and thus avoid infinite loops
when trying to use gdk_pixmap_create_from_xpm()
on unreadable values.
Fri Jan 21 18:32:43 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkaspectframe.h (struct _GtkAspectFrame): s/gint/gboolean/.

8
ChangeLog.pre-2-10
View File

@@ -1,3 +1,11 @@
Sat Jan 22 12:40:48 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixmap.c (gdk_pixmap_seek_string): Rewrite
to account for the fact that feof() does _not_
return TRUE on errors, and thus avoid infinite loops
when trying to use gdk_pixmap_create_from_xpm()
on unreadable values.
Fri Jan 21 18:32:43 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkaspectframe.h (struct _GtkAspectFrame): s/gint/gboolean/.

8
ChangeLog.pre-2-2
View File

@@ -1,3 +1,11 @@
Sat Jan 22 12:40:48 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixmap.c (gdk_pixmap_seek_string): Rewrite
to account for the fact that feof() does _not_
return TRUE on errors, and thus avoid infinite loops
when trying to use gdk_pixmap_create_from_xpm()
on unreadable values.
Fri Jan 21 18:32:43 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkaspectframe.h (struct _GtkAspectFrame): s/gint/gboolean/.

8
ChangeLog.pre-2-4
View File

@@ -1,3 +1,11 @@
Sat Jan 22 12:40:48 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixmap.c (gdk_pixmap_seek_string): Rewrite
to account for the fact that feof() does _not_
return TRUE on errors, and thus avoid infinite loops
when trying to use gdk_pixmap_create_from_xpm()
on unreadable values.
Fri Jan 21 18:32:43 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkaspectframe.h (struct _GtkAspectFrame): s/gint/gboolean/.

8
ChangeLog.pre-2-6
View File

@@ -1,3 +1,11 @@
Sat Jan 22 12:40:48 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixmap.c (gdk_pixmap_seek_string): Rewrite
to account for the fact that feof() does _not_
return TRUE on errors, and thus avoid infinite loops
when trying to use gdk_pixmap_create_from_xpm()
on unreadable values.
Fri Jan 21 18:32:43 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkaspectframe.h (struct _GtkAspectFrame): s/gint/gboolean/.

8
ChangeLog.pre-2-8
View File

@@ -1,3 +1,11 @@
Sat Jan 22 12:40:48 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixmap.c (gdk_pixmap_seek_string): Rewrite
to account for the fact that feof() does _not_
return TRUE on errors, and thus avoid infinite loops
when trying to use gdk_pixmap_create_from_xpm()
on unreadable values.
Fri Jan 21 18:32:43 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkaspectframe.h (struct _GtkAspectFrame): s/gint/gboolean/.

20
gdk/gdkpixmap.c
View File

@@ -197,21 +197,23 @@ gdk_pixmap_seek_string (FILE *infile,
{
char instr[1024];
while (!feof (infile))
while (1)
{
fscanf (infile, "%1023s", instr);
if (fscanf (infile, "%1023s", instr) != 1)
return FALSE;
if (skip_comments == TRUE && strcmp (instr, "/*") == 0)
{
fscanf (infile, "%1023s", instr);
while (!feof (infile) && strcmp (instr, "*/") != 0)
fscanf (infile, "%1023s", instr);
fscanf(infile, "%1023s", instr);
do
{
if (fscanf (infile, "%1023s", instr) != 1)
return FALSE;
}
while (strcmp (instr, "*/") != 0);
}
if (strcmp (instr, str)==0)
else if (strcmp (instr, str) == 0)
return TRUE;
}
return FALSE;
}
static gint