diff --git a/ChangeLog b/ChangeLog index 24f2800e09..da370e7a58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-03-08 Jay Cox + + * app/plug_in.c: use g_io_channel_close/unref pairs instead of close + in plug_in_open(). + 1999-03-07 Tor Lillqvist Second batch of Win32 merging. This time also some Unix code is diff --git a/app/actions/plug-in-commands.c b/app/actions/plug-in-commands.c index faab7317ba..73ce25151d 100644 --- a/app/actions/plug-in-commands.c +++ b/app/actions/plug-in-commands.c @@ -1131,8 +1131,13 @@ plug_in_open (PlugIn *plug_in) if (plug_in->pid == 0) { - close(plug_in->my_read); - close(plug_in->my_write); + g_io_channel_close (plug_in->my_read); + g_io_channel_unref (plug_in->my_read); + plug_in->my_read = NULL; + g_io_channel_close (plug_in->my_write); + g_io_channel_unref (plug_in->my_write); + plug_in->my_write = NULL; + /* Execute the filter. The "_exit" call should never * be reached, unless some strange error condition * exists. diff --git a/app/gui/plug-in-commands.c b/app/gui/plug-in-commands.c index faab7317ba..73ce25151d 100644 --- a/app/gui/plug-in-commands.c +++ b/app/gui/plug-in-commands.c @@ -1131,8 +1131,13 @@ plug_in_open (PlugIn *plug_in) if (plug_in->pid == 0) { - close(plug_in->my_read); - close(plug_in->my_write); + g_io_channel_close (plug_in->my_read); + g_io_channel_unref (plug_in->my_read); + plug_in->my_read = NULL; + g_io_channel_close (plug_in->my_write); + g_io_channel_unref (plug_in->my_write); + plug_in->my_write = NULL; + /* Execute the filter. The "_exit" call should never * be reached, unless some strange error condition * exists. diff --git a/app/gui/plug-in-menus.c b/app/gui/plug-in-menus.c index faab7317ba..73ce25151d 100644 --- a/app/gui/plug-in-menus.c +++ b/app/gui/plug-in-menus.c @@ -1131,8 +1131,13 @@ plug_in_open (PlugIn *plug_in) if (plug_in->pid == 0) { - close(plug_in->my_read); - close(plug_in->my_write); + g_io_channel_close (plug_in->my_read); + g_io_channel_unref (plug_in->my_read); + plug_in->my_read = NULL; + g_io_channel_close (plug_in->my_write); + g_io_channel_unref (plug_in->my_write); + plug_in->my_write = NULL; + /* Execute the filter. The "_exit" call should never * be reached, unless some strange error condition * exists. diff --git a/app/menus/plug-in-menus.c b/app/menus/plug-in-menus.c index faab7317ba..73ce25151d 100644 --- a/app/menus/plug-in-menus.c +++ b/app/menus/plug-in-menus.c @@ -1131,8 +1131,13 @@ plug_in_open (PlugIn *plug_in) if (plug_in->pid == 0) { - close(plug_in->my_read); - close(plug_in->my_write); + g_io_channel_close (plug_in->my_read); + g_io_channel_unref (plug_in->my_read); + plug_in->my_read = NULL; + g_io_channel_close (plug_in->my_write); + g_io_channel_unref (plug_in->my_write); + plug_in->my_write = NULL; + /* Execute the filter. The "_exit" call should never * be reached, unless some strange error condition * exists. diff --git a/app/plug-in/gimpplugin-message.c b/app/plug-in/gimpplugin-message.c index faab7317ba..73ce25151d 100644 --- a/app/plug-in/gimpplugin-message.c +++ b/app/plug-in/gimpplugin-message.c @@ -1131,8 +1131,13 @@ plug_in_open (PlugIn *plug_in) if (plug_in->pid == 0) { - close(plug_in->my_read); - close(plug_in->my_write); + g_io_channel_close (plug_in->my_read); + g_io_channel_unref (plug_in->my_read); + plug_in->my_read = NULL; + g_io_channel_close (plug_in->my_write); + g_io_channel_unref (plug_in->my_write); + plug_in->my_write = NULL; + /* Execute the filter. The "_exit" call should never * be reached, unless some strange error condition * exists. diff --git a/app/plug-in/gimpplugin-progress.c b/app/plug-in/gimpplugin-progress.c index faab7317ba..73ce25151d 100644 --- a/app/plug-in/gimpplugin-progress.c +++ b/app/plug-in/gimpplugin-progress.c @@ -1131,8 +1131,13 @@ plug_in_open (PlugIn *plug_in) if (plug_in->pid == 0) { - close(plug_in->my_read); - close(plug_in->my_write); + g_io_channel_close (plug_in->my_read); + g_io_channel_unref (plug_in->my_read); + plug_in->my_read = NULL; + g_io_channel_close (plug_in->my_write); + g_io_channel_unref (plug_in->my_write); + plug_in->my_write = NULL; + /* Execute the filter. The "_exit" call should never * be reached, unless some strange error condition * exists. diff --git a/app/plug-in/gimpplugin.c b/app/plug-in/gimpplugin.c index faab7317ba..73ce25151d 100644 --- a/app/plug-in/gimpplugin.c +++ b/app/plug-in/gimpplugin.c @@ -1131,8 +1131,13 @@ plug_in_open (PlugIn *plug_in) if (plug_in->pid == 0) { - close(plug_in->my_read); - close(plug_in->my_write); + g_io_channel_close (plug_in->my_read); + g_io_channel_unref (plug_in->my_read); + plug_in->my_read = NULL; + g_io_channel_close (plug_in->my_write); + g_io_channel_unref (plug_in->my_write); + plug_in->my_write = NULL; + /* Execute the filter. The "_exit" call should never * be reached, unless some strange error condition * exists. diff --git a/app/plug-in/gimppluginmanager-call.c b/app/plug-in/gimppluginmanager-call.c index faab7317ba..73ce25151d 100644 --- a/app/plug-in/gimppluginmanager-call.c +++ b/app/plug-in/gimppluginmanager-call.c @@ -1131,8 +1131,13 @@ plug_in_open (PlugIn *plug_in) if (plug_in->pid == 0) { - close(plug_in->my_read); - close(plug_in->my_write); + g_io_channel_close (plug_in->my_read); + g_io_channel_unref (plug_in->my_read); + plug_in->my_read = NULL; + g_io_channel_close (plug_in->my_write); + g_io_channel_unref (plug_in->my_write); + plug_in->my_write = NULL; + /* Execute the filter. The "_exit" call should never * be reached, unless some strange error condition * exists. diff --git a/app/plug-in/gimppluginmanager-run.c b/app/plug-in/gimppluginmanager-run.c index faab7317ba..73ce25151d 100644 --- a/app/plug-in/gimppluginmanager-run.c +++ b/app/plug-in/gimppluginmanager-run.c @@ -1131,8 +1131,13 @@ plug_in_open (PlugIn *plug_in) if (plug_in->pid == 0) { - close(plug_in->my_read); - close(plug_in->my_write); + g_io_channel_close (plug_in->my_read); + g_io_channel_unref (plug_in->my_read); + plug_in->my_read = NULL; + g_io_channel_close (plug_in->my_write); + g_io_channel_unref (plug_in->my_write); + plug_in->my_write = NULL; + /* Execute the filter. The "_exit" call should never * be reached, unless some strange error condition * exists. diff --git a/app/plug-in/gimppluginmanager.c b/app/plug-in/gimppluginmanager.c index faab7317ba..73ce25151d 100644 --- a/app/plug-in/gimppluginmanager.c +++ b/app/plug-in/gimppluginmanager.c @@ -1131,8 +1131,13 @@ plug_in_open (PlugIn *plug_in) if (plug_in->pid == 0) { - close(plug_in->my_read); - close(plug_in->my_write); + g_io_channel_close (plug_in->my_read); + g_io_channel_unref (plug_in->my_read); + plug_in->my_read = NULL; + g_io_channel_close (plug_in->my_write); + g_io_channel_unref (plug_in->my_write); + plug_in->my_write = NULL; + /* Execute the filter. The "_exit" call should never * be reached, unless some strange error condition * exists. diff --git a/app/plug-in/gimppluginshm.c b/app/plug-in/gimppluginshm.c index faab7317ba..73ce25151d 100644 --- a/app/plug-in/gimppluginshm.c +++ b/app/plug-in/gimppluginshm.c @@ -1131,8 +1131,13 @@ plug_in_open (PlugIn *plug_in) if (plug_in->pid == 0) { - close(plug_in->my_read); - close(plug_in->my_write); + g_io_channel_close (plug_in->my_read); + g_io_channel_unref (plug_in->my_read); + plug_in->my_read = NULL; + g_io_channel_close (plug_in->my_write); + g_io_channel_unref (plug_in->my_write); + plug_in->my_write = NULL; + /* Execute the filter. The "_exit" call should never * be reached, unless some strange error condition * exists. diff --git a/app/plug-in/plug-in-def.c b/app/plug-in/plug-in-def.c index faab7317ba..73ce25151d 100644 --- a/app/plug-in/plug-in-def.c +++ b/app/plug-in/plug-in-def.c @@ -1131,8 +1131,13 @@ plug_in_open (PlugIn *plug_in) if (plug_in->pid == 0) { - close(plug_in->my_read); - close(plug_in->my_write); + g_io_channel_close (plug_in->my_read); + g_io_channel_unref (plug_in->my_read); + plug_in->my_read = NULL; + g_io_channel_close (plug_in->my_write); + g_io_channel_unref (plug_in->my_write); + plug_in->my_write = NULL; + /* Execute the filter. The "_exit" call should never * be reached, unless some strange error condition * exists. diff --git a/app/plug-in/plug-in-message.c b/app/plug-in/plug-in-message.c index faab7317ba..73ce25151d 100644 --- a/app/plug-in/plug-in-message.c +++ b/app/plug-in/plug-in-message.c @@ -1131,8 +1131,13 @@ plug_in_open (PlugIn *plug_in) if (plug_in->pid == 0) { - close(plug_in->my_read); - close(plug_in->my_write); + g_io_channel_close (plug_in->my_read); + g_io_channel_unref (plug_in->my_read); + plug_in->my_read = NULL; + g_io_channel_close (plug_in->my_write); + g_io_channel_unref (plug_in->my_write); + plug_in->my_write = NULL; + /* Execute the filter. The "_exit" call should never * be reached, unless some strange error condition * exists. diff --git a/app/plug-in/plug-in-params.c b/app/plug-in/plug-in-params.c index faab7317ba..73ce25151d 100644 --- a/app/plug-in/plug-in-params.c +++ b/app/plug-in/plug-in-params.c @@ -1131,8 +1131,13 @@ plug_in_open (PlugIn *plug_in) if (plug_in->pid == 0) { - close(plug_in->my_read); - close(plug_in->my_write); + g_io_channel_close (plug_in->my_read); + g_io_channel_unref (plug_in->my_read); + plug_in->my_read = NULL; + g_io_channel_close (plug_in->my_write); + g_io_channel_unref (plug_in->my_write); + plug_in->my_write = NULL; + /* Execute the filter. The "_exit" call should never * be reached, unless some strange error condition * exists. diff --git a/app/plug-in/plug-in-progress.c b/app/plug-in/plug-in-progress.c index faab7317ba..73ce25151d 100644 --- a/app/plug-in/plug-in-progress.c +++ b/app/plug-in/plug-in-progress.c @@ -1131,8 +1131,13 @@ plug_in_open (PlugIn *plug_in) if (plug_in->pid == 0) { - close(plug_in->my_read); - close(plug_in->my_write); + g_io_channel_close (plug_in->my_read); + g_io_channel_unref (plug_in->my_read); + plug_in->my_read = NULL; + g_io_channel_close (plug_in->my_write); + g_io_channel_unref (plug_in->my_write); + plug_in->my_write = NULL; + /* Execute the filter. The "_exit" call should never * be reached, unless some strange error condition * exists. diff --git a/app/plug-in/plug-in-run.c b/app/plug-in/plug-in-run.c index faab7317ba..73ce25151d 100644 --- a/app/plug-in/plug-in-run.c +++ b/app/plug-in/plug-in-run.c @@ -1131,8 +1131,13 @@ plug_in_open (PlugIn *plug_in) if (plug_in->pid == 0) { - close(plug_in->my_read); - close(plug_in->my_write); + g_io_channel_close (plug_in->my_read); + g_io_channel_unref (plug_in->my_read); + plug_in->my_read = NULL; + g_io_channel_close (plug_in->my_write); + g_io_channel_unref (plug_in->my_write); + plug_in->my_write = NULL; + /* Execute the filter. The "_exit" call should never * be reached, unless some strange error condition * exists. diff --git a/app/plug-in/plug-in-shm.c b/app/plug-in/plug-in-shm.c index faab7317ba..73ce25151d 100644 --- a/app/plug-in/plug-in-shm.c +++ b/app/plug-in/plug-in-shm.c @@ -1131,8 +1131,13 @@ plug_in_open (PlugIn *plug_in) if (plug_in->pid == 0) { - close(plug_in->my_read); - close(plug_in->my_write); + g_io_channel_close (plug_in->my_read); + g_io_channel_unref (plug_in->my_read); + plug_in->my_read = NULL; + g_io_channel_close (plug_in->my_write); + g_io_channel_unref (plug_in->my_write); + plug_in->my_write = NULL; + /* Execute the filter. The "_exit" call should never * be reached, unless some strange error condition * exists. diff --git a/app/plug-in/plug-in.c b/app/plug-in/plug-in.c index faab7317ba..73ce25151d 100644 --- a/app/plug-in/plug-in.c +++ b/app/plug-in/plug-in.c @@ -1131,8 +1131,13 @@ plug_in_open (PlugIn *plug_in) if (plug_in->pid == 0) { - close(plug_in->my_read); - close(plug_in->my_write); + g_io_channel_close (plug_in->my_read); + g_io_channel_unref (plug_in->my_read); + plug_in->my_read = NULL; + g_io_channel_close (plug_in->my_write); + g_io_channel_unref (plug_in->my_write); + plug_in->my_write = NULL; + /* Execute the filter. The "_exit" call should never * be reached, unless some strange error condition * exists. diff --git a/app/plug-in/plug-ins.c b/app/plug-in/plug-ins.c index faab7317ba..73ce25151d 100644 --- a/app/plug-in/plug-ins.c +++ b/app/plug-in/plug-ins.c @@ -1131,8 +1131,13 @@ plug_in_open (PlugIn *plug_in) if (plug_in->pid == 0) { - close(plug_in->my_read); - close(plug_in->my_write); + g_io_channel_close (plug_in->my_read); + g_io_channel_unref (plug_in->my_read); + plug_in->my_read = NULL; + g_io_channel_close (plug_in->my_write); + g_io_channel_unref (plug_in->my_write); + plug_in->my_write = NULL; + /* Execute the filter. The "_exit" call should never * be reached, unless some strange error condition * exists. diff --git a/app/plug_in.c b/app/plug_in.c index faab7317ba..73ce25151d 100644 --- a/app/plug_in.c +++ b/app/plug_in.c @@ -1131,8 +1131,13 @@ plug_in_open (PlugIn *plug_in) if (plug_in->pid == 0) { - close(plug_in->my_read); - close(plug_in->my_write); + g_io_channel_close (plug_in->my_read); + g_io_channel_unref (plug_in->my_read); + plug_in->my_read = NULL; + g_io_channel_close (plug_in->my_write); + g_io_channel_unref (plug_in->my_write); + plug_in->my_write = NULL; + /* Execute the filter. The "_exit" call should never * be reached, unless some strange error condition * exists.