[
Sent to gtk-devel w/o response :
The patch below fixes it on the Gimp level, ok to apply ?
]
In glib/gscanner.c there are various places where
scanner->input_fd is set to -1
Current Gimp cvs (compiled on win32) triggers
the one in g_scanner_get_char() and as a result looses
it's reference to the input file.
Is it an error in the usage of GScanner or should the
input_fd simply not be used as persitent during the
scanning phase ?
Shouldn't there be at least a g_warning when GScanner
destroys the input_fd reference ?
Thanks in advance,
Hans
--- from-cvs/gimp/app/config/gimpscanner.c Thu Apr 24 13:38:02 2003
+++ my-gtk/gimp/app/config/gimpscanner.c Thu Jun 19 19:16:28 2003
@@ -54,6 +54,13 @@
gboolean is_error);
+typedef struct _GimpScannerUserData GimpScannerUserData;
+struct _GimpScannerUserData
+{
+ GError **error;
+ int fd;
+};
+
/* public functions */
GScanner *
@@ -62,6 +69,7 @@
{
gint fd;
GScanner *scanner;
+ GimpScannerUserData *user_data;
g_return_val_if_fail (filename != NULL, NULL);
@@ -82,7 +90,11 @@
g_scanner_input_file (scanner, fd);
- scanner->user_data = error;
+ user_data = g_new(GimpScannerUserData, 1);
+ user_data->error = error;
+ user_data->fd = fd;
+
+ scanner->user_data = user_data;
scanner->msg_handler = gimp_scanner_message;
scanner->input_name = g_strdup (filename);
@@ -98,9 +110,13 @@
void
gimp_scanner_destroy (GScanner *scanner)
{
+ GimpScannerUserData *user_data = scanner->user_data;
+
g_return_if_fail (scanner != NULL);
- close (scanner->input_fd);
+ if (close (user_data->fd) != 0)
+ g_warning ("Failed to close '%s' : %s", scanner->input_name,
g_strerror (errno));
+ g_free (scanner->user_data);
g_free ((gchar *) scanner->input_name);
g_scanner_destroy (scanner);
}
@@ -344,12 +360,12 @@
gchar *message,
gboolean is_error)
{
- GError **error = scanner->user_data;
+ GimpScannerUserData *user_data = scanner->user_data;
/* we don't expect warnings */
g_return_if_fail (is_error);
- g_set_error (error,
+ g_set_error (user_data->error,
GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_PARSE,
_("Error while parsing '%s' in line %d:\n%s"),
scanner->input_name, scanner->line, message);
-------- Hans "at" Breuer "dot" Org -----------
Tell me what you need, and I'll tell you how to
get along without it. -- Dilbert
_______________________________________________
Gimp-developer mailing list
[EMAIL PROTECTED]
http://lists.xcf.berkeley.edu/mailman/listinfo/gimp-developer
