From 648cccde5efabdb580baf8bb6f7301bf87f1a212 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Mon, 7 Feb 2005 01:24:22 +0000 Subject: [PATCH] app/base/base.c app/base/temp-buf.c app/base/tile-swap.c 2005-02-07 Sven Neumann * app/base/base.c * app/base/temp-buf.c * app/base/tile-swap.c * app/config/gimpconfig-file.c * app/core/gimpbrush.c * app/core/gimpbrushgenerated.c * app/core/gimpbrushpipe.c * app/core/gimpdata.c * app/core/gimpenvirontable.c * app/core/gimpgradient-load.c * app/core/gimpgradient-save.c * app/core/gimppalette-import.c * app/core/gimppalette.c * app/core/gimppattern.c * app/dialogs/user-install-dialog.c * app/gui/session.c * app/menus/menus.c * app/widgets/gimpdevices.c: use gstdio wrappers. --- ChangeLog | 21 +++++++++++++++++++ app/base/base.c | 8 +++++--- app/base/temp-buf.c | 33 +++++++++++++++++------------- app/base/tile-swap.c | 21 ++++++++++--------- app/config/gimpconfig-file.c | 5 ++--- app/core/gimpbrush-load.c | 7 ++++--- app/core/gimpbrush.c | 7 ++++--- app/core/gimpbrushgenerated-load.c | 6 +++--- app/core/gimpbrushgenerated-save.c | 6 +++--- app/core/gimpbrushgenerated.c | 6 +++--- app/core/gimpbrushpipe-load.c | 5 +++-- app/core/gimpbrushpipe.c | 5 +++-- app/core/gimpdata.c | 4 ++-- app/core/gimpenvirontable.c | 8 ++++---- app/core/gimpgradient-load.c | 4 ++-- app/core/gimpgradient-save.c | 6 +++--- app/core/gimppalette-import.c | 6 +++--- app/core/gimppalette-load.c | 7 ++++--- app/core/gimppalette-save.c | 7 ++++--- app/core/gimppalette.c | 7 ++++--- app/core/gimppattern-load.c | 7 ++++--- app/core/gimppattern.c | 7 ++++--- app/dialogs/user-install-dialog.c | 11 +++++----- app/gui/session.c | 5 +++-- app/menus/menus.c | 4 +++- app/plug-in/gimpenvirontable.c | 8 ++++---- app/widgets/gimpdevices.c | 4 +++- 27 files changed, 134 insertions(+), 91 deletions(-) diff --git a/ChangeLog b/ChangeLog index 051abf0fbe..c10711d323 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2005-02-07 Sven Neumann + + * app/base/base.c + * app/base/temp-buf.c + * app/base/tile-swap.c + * app/config/gimpconfig-file.c + * app/core/gimpbrush.c + * app/core/gimpbrushgenerated.c + * app/core/gimpbrushpipe.c + * app/core/gimpdata.c + * app/core/gimpenvirontable.c + * app/core/gimpgradient-load.c + * app/core/gimpgradient-save.c + * app/core/gimppalette-import.c + * app/core/gimppalette.c + * app/core/gimppattern.c + * app/dialogs/user-install-dialog.c + * app/gui/session.c + * app/menus/menus.c + * app/widgets/gimpdevices.c: use gstdio wrappers. + 2005-02-07 Sven Neumann * libgimpbase/gimpdatafiles.c diff --git a/app/base/base.c b/app/base/base.c index 072afb3a9a..5f17848cff 100644 --- a/app/base/base.c +++ b/app/base/base.c @@ -21,12 +21,15 @@ #include #include #include + #ifdef HAVE_UNISTD_H #include #endif + #include #include +#include #ifdef G_OS_WIN32 #include /* for _getpid() */ @@ -170,10 +173,9 @@ base_toast_old_temp_files (GimpBaseConfig *config) if (kill (pid, 0)) #endif { - gchar *filename; + gchar *filename = g_build_filename (dirname, entry, NULL); - filename = g_build_filename (dirname, entry, NULL); - unlink (filename); + g_unlink (filename); g_free (filename); } } diff --git a/app/base/temp-buf.c b/app/base/temp-buf.c index 2b69b8178e..19215bcaa5 100644 --- a/app/base/temp-buf.c +++ b/app/base/temp-buf.c @@ -20,14 +20,15 @@ #include #include -#include #include #include + #ifdef HAVE_UNISTD_H #include #endif #include +#include #ifdef G_OS_WIN32 #include /* For _getpid() */ @@ -689,7 +690,8 @@ temp_buf_swap (TempBuf *buf) } /* Open file for overwrite */ - if ((fp = fopen (filename, "wb"))) + fp = g_fopen (filename, "wb"); + if (fp) { gsize blocks_written; @@ -701,20 +703,18 @@ temp_buf_swap (TempBuf *buf) to flush its buffers */ if ((0 != fclose (fp)) || (1 != blocks_written)) { - unlink (filename); + g_unlink (filename); perror ("Write error on temp buf"); - g_message ("Cannot write \"%s\"", - gimp_filename_to_utf8 (filename)); + g_message ("Cannot write \"%s\"", gimp_filename_to_utf8 (filename)); g_free (filename); return; } } else { - unlink (filename); + g_unlink (filename); perror ("Error in temp buf caching"); - g_message ("Cannot write \"%s\"", - gimp_filename_to_utf8 (filename)); + g_message ("Cannot write \"%s\"", gimp_filename_to_utf8 (filename)); g_free (filename); return; } @@ -749,7 +749,8 @@ temp_buf_unswap (TempBuf *buf) if (g_file_test (buf->filename, G_FILE_TEST_IS_REGULAR)) { - if ((fp = fopen (buf->filename, "rb"))) + fp = g_fopen (buf->filename, "rb"); + if (fp) { gsize blocks_read; @@ -764,10 +765,12 @@ temp_buf_unswap (TempBuf *buf) succ = TRUE; } else - perror ("Error in temp buf caching"); + { + perror ("Error in temp buf caching"); + } /* Delete the swap file */ - unlink (buf->filename); + g_unlink (buf->filename); } if (!succ) @@ -798,15 +801,17 @@ temp_buf_swap_free (TempBuf *buf) if (g_file_test (buf->filename, G_FILE_TEST_IS_REGULAR)) { /* Delete the swap file */ - unlink (buf->filename); + g_unlink (buf->filename); } else g_message ("Error in temp buf disk swapping: " "information swapped to disk was lost!"); if (buf->filename) - g_free (buf->filename); /* free filename */ - buf->filename = NULL; + { + g_free (buf->filename); + buf->filename = NULL; + } } void diff --git a/app/base/tile-swap.c b/app/base/tile-swap.c index 59ef813a32..02208c11c6 100644 --- a/app/base/tile-swap.c +++ b/app/base/tile-swap.c @@ -18,19 +18,20 @@ #include "config.h" -#include /* SEEK_SET */ #include #include -#include #include + #ifdef HAVE_UNISTD_H #include #endif + #ifdef USE_PTHREADS #include #endif #include +#include #include "libgimpbase/gimpbase.h" @@ -203,7 +204,7 @@ tile_swap_exit1 (gpointer key, swap_file->fd = -1; } #endif - unlink (swap_file->filename); + g_unlink (swap_file->filename); } } @@ -344,15 +345,15 @@ tile_swap_test (void) g_assert (swap_file->fd == -1); /* make sure this duplicates the open() call from tile_swap_open() */ - swap_file->fd = open (swap_file->filename, - O_CREAT | O_RDWR | _O_BINARY | _O_TEMPORARY, - S_IREAD | S_IWRITE); + swap_file->fd = g_open (swap_file->filename, + O_CREAT | O_RDWR | _O_BINARY | _O_TEMPORARY, + S_IREAD | S_IWRITE); if (swap_file->fd != -1) { close (swap_file->fd); swap_file->fd = -1; - unlink (swap_file->filename); + g_unlink (swap_file->filename); return TRUE; } @@ -447,9 +448,9 @@ tile_swap_open (SwapFile *swap_file) } /* duplicate this open() call in tile_swap_test() */ - swap_file->fd = open (swap_file->filename, - O_CREAT | O_RDWR | _O_BINARY | _O_TEMPORARY, - S_IRUSR | S_IWUSR); + swap_file->fd = g_open (swap_file->filename, + O_CREAT | O_RDWR | _O_BINARY | _O_TEMPORARY, + S_IRUSR | S_IWUSR); if (swap_file->fd == -1) { diff --git a/app/config/gimpconfig-file.c b/app/config/gimpconfig-file.c index 3fdae750f5..8782cfd617 100644 --- a/app/config/gimpconfig-file.c +++ b/app/config/gimpconfig-file.c @@ -21,12 +21,11 @@ #include "config.h" -#include #include #include -#include #include +#include #include "libgimpbase/gimpbase.h" #include "libgimpconfig/gimpconfig.h" @@ -103,7 +102,7 @@ gimp_config_file_copy (const gchar *source, return FALSE; } - if (stat (source, &stat_buf) == 0) + if (g_stat (source, &stat_buf) == 0) { chmod (dest, stat_buf.st_mode); } diff --git a/app/core/gimpbrush-load.c b/app/core/gimpbrush-load.c index 6cc43a42a2..823aba50dc 100644 --- a/app/core/gimpbrush-load.c +++ b/app/core/gimpbrush-load.c @@ -20,17 +20,18 @@ #include #include -#include #include #include -#include + #ifdef HAVE_UNISTD_H #include #endif + #include #include +#include #ifdef G_OS_WIN32 /* gets defined by glib.h */ #include @@ -389,7 +390,7 @@ gimp_brush_load (const gchar *filename, g_return_val_if_fail (g_path_is_absolute (filename), NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL); - fd = open (filename, O_RDONLY | _O_BINARY); + fd = g_open (filename, O_RDONLY | _O_BINARY, 0); if (fd == -1) { g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_OPEN, diff --git a/app/core/gimpbrush.c b/app/core/gimpbrush.c index 6cc43a42a2..823aba50dc 100644 --- a/app/core/gimpbrush.c +++ b/app/core/gimpbrush.c @@ -20,17 +20,18 @@ #include #include -#include #include #include -#include + #ifdef HAVE_UNISTD_H #include #endif + #include #include +#include #ifdef G_OS_WIN32 /* gets defined by glib.h */ #include @@ -389,7 +390,7 @@ gimp_brush_load (const gchar *filename, g_return_val_if_fail (g_path_is_absolute (filename), NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL); - fd = open (filename, O_RDONLY | _O_BINARY); + fd = g_open (filename, O_RDONLY | _O_BINARY, 0); if (fd == -1) { g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_OPEN, diff --git a/app/core/gimpbrushgenerated-load.c b/app/core/gimpbrushgenerated-load.c index 40aa7c7f8c..0cd7fdd2c9 100644 --- a/app/core/gimpbrushgenerated-load.c +++ b/app/core/gimpbrushgenerated-load.c @@ -21,7 +21,6 @@ #include "config.h" #include -#include #include #include @@ -30,6 +29,7 @@ #endif #include +#include #include "libgimpbase/gimpbase.h" #include "libgimpmath/gimpmath.h" @@ -247,7 +247,7 @@ gimp_brush_generated_save (GimpData *data, gchar buf[G_ASCII_DTOSTR_BUF_SIZE]; gboolean have_shape = FALSE; - file = fopen (data->filename, "wb"); + file = g_fopen (data->filename, "wb"); if (! file) { @@ -593,7 +593,7 @@ gimp_brush_generated_load (const gchar *filename, g_return_val_if_fail (g_path_is_absolute (filename), NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL); - file = fopen (filename, "rb"); + file = g_fopen (filename, "rb"); if (! file) { diff --git a/app/core/gimpbrushgenerated-save.c b/app/core/gimpbrushgenerated-save.c index 40aa7c7f8c..0cd7fdd2c9 100644 --- a/app/core/gimpbrushgenerated-save.c +++ b/app/core/gimpbrushgenerated-save.c @@ -21,7 +21,6 @@ #include "config.h" #include -#include #include #include @@ -30,6 +29,7 @@ #endif #include +#include #include "libgimpbase/gimpbase.h" #include "libgimpmath/gimpmath.h" @@ -247,7 +247,7 @@ gimp_brush_generated_save (GimpData *data, gchar buf[G_ASCII_DTOSTR_BUF_SIZE]; gboolean have_shape = FALSE; - file = fopen (data->filename, "wb"); + file = g_fopen (data->filename, "wb"); if (! file) { @@ -593,7 +593,7 @@ gimp_brush_generated_load (const gchar *filename, g_return_val_if_fail (g_path_is_absolute (filename), NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL); - file = fopen (filename, "rb"); + file = g_fopen (filename, "rb"); if (! file) { diff --git a/app/core/gimpbrushgenerated.c b/app/core/gimpbrushgenerated.c index 40aa7c7f8c..0cd7fdd2c9 100644 --- a/app/core/gimpbrushgenerated.c +++ b/app/core/gimpbrushgenerated.c @@ -21,7 +21,6 @@ #include "config.h" #include -#include #include #include @@ -30,6 +29,7 @@ #endif #include +#include #include "libgimpbase/gimpbase.h" #include "libgimpmath/gimpmath.h" @@ -247,7 +247,7 @@ gimp_brush_generated_save (GimpData *data, gchar buf[G_ASCII_DTOSTR_BUF_SIZE]; gboolean have_shape = FALSE; - file = fopen (data->filename, "wb"); + file = g_fopen (data->filename, "wb"); if (! file) { @@ -593,7 +593,7 @@ gimp_brush_generated_load (const gchar *filename, g_return_val_if_fail (g_path_is_absolute (filename), NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL); - file = fopen (filename, "rb"); + file = g_fopen (filename, "rb"); if (! file) { diff --git a/app/core/gimpbrushpipe-load.c b/app/core/gimpbrushpipe-load.c index e628128068..45cf2c2a37 100644 --- a/app/core/gimpbrushpipe-load.c +++ b/app/core/gimpbrushpipe-load.c @@ -24,7 +24,7 @@ #include #include -#include + #ifdef HAVE_UNISTD_H #include #endif @@ -35,6 +35,7 @@ #endif #include +#include #ifdef G_OS_WIN32 #include @@ -330,7 +331,7 @@ gimp_brush_pipe_load (const gchar *filename, g_return_val_if_fail (g_path_is_absolute (filename), NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL); - fd = open (filename, O_RDONLY | _O_BINARY); + fd = g_open (filename, O_RDONLY | _O_BINARY, 0); if (fd == -1) { diff --git a/app/core/gimpbrushpipe.c b/app/core/gimpbrushpipe.c index e628128068..45cf2c2a37 100644 --- a/app/core/gimpbrushpipe.c +++ b/app/core/gimpbrushpipe.c @@ -24,7 +24,7 @@ #include #include -#include + #ifdef HAVE_UNISTD_H #include #endif @@ -35,6 +35,7 @@ #endif #include +#include #ifdef G_OS_WIN32 #include @@ -330,7 +331,7 @@ gimp_brush_pipe_load (const gchar *filename, g_return_val_if_fail (g_path_is_absolute (filename), NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL); - fd = open (filename, O_RDONLY | _O_BINARY); + fd = g_open (filename, O_RDONLY | _O_BINARY, 0); if (fd == -1) { diff --git a/app/core/gimpdata.c b/app/core/gimpdata.c index 81b7a0d41f..242fbb3521 100644 --- a/app/core/gimpdata.c +++ b/app/core/gimpdata.c @@ -22,7 +22,6 @@ #include "config.h" #include -#include #include #ifdef HAVE_UNISTD_H @@ -30,6 +29,7 @@ #endif #include +#include #include "libgimpbase/gimpbase.h" @@ -308,7 +308,7 @@ gimp_data_delete_from_disk (GimpData *data, if (data->internal) return TRUE; - if (unlink (data->filename) == -1) + if (g_unlink (data->filename) == -1) { g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_DELETE, _("Could not delete '%s': %s"), diff --git a/app/core/gimpenvirontable.c b/app/core/gimpenvirontable.c index 1ded61d0e3..d0a289e931 100644 --- a/app/core/gimpenvirontable.c +++ b/app/core/gimpenvirontable.c @@ -21,11 +21,11 @@ #include "config.h" -#include #include #include #include +#include #include "libgimpbase/gimpbase.h" @@ -229,7 +229,7 @@ gimp_environ_table_get_envp (GimpEnvironTable *environ_table) /* Hmm.. should we return a copy here in the future? Not thread safe atm, * but the rest of it isn't either. - */ + */ if (! environ_table->envp) gimp_environ_table_populate (environ_table); @@ -253,7 +253,7 @@ gimp_environ_table_load_env_file (const GimpDatafileData *file_data, environ_table = GIMP_ENVIRON_TABLE (user_data); - env = fopen (file_data->filename, "r"); + env = g_fopen (file_data->filename, "r"); if (! env) return; @@ -377,7 +377,7 @@ gimp_environ_table_populate (GimpEnvironTable *environ_table) #ifdef ENVP_DEBUG var = environ_table->envp; - g_print ("GimpEnvironTable:\n"); + g_print ("GimpEnvironTable:\n"); while (*var) { g_print ("%s\n", *var); diff --git a/app/core/gimpgradient-load.c b/app/core/gimpgradient-load.c index ff1811047f..8f2063702d 100644 --- a/app/core/gimpgradient-load.c +++ b/app/core/gimpgradient-load.c @@ -18,12 +18,12 @@ #include "config.h" -#include #include #include #include #include +#include #include "libgimpbase/gimpbase.h" #include "libgimpcolor/gimpcolor.h" @@ -56,7 +56,7 @@ gimp_gradient_load (const gchar *filename, g_return_val_if_fail (g_path_is_absolute (filename), NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL); - file = fopen (filename, "rb"); + file = g_fopen (filename, "rb"); if (!file) { g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_OPEN, diff --git a/app/core/gimpgradient-save.c b/app/core/gimpgradient-save.c index adcffbde13..9098ea9a4d 100644 --- a/app/core/gimpgradient-save.c +++ b/app/core/gimpgradient-save.c @@ -18,11 +18,11 @@ #include "config.h" -#include #include #include #include +#include #include "libgimpbase/gimpbase.h" @@ -43,7 +43,7 @@ gimp_gradient_save (GimpData *data, gint num_segments; FILE *file; - file = fopen (data->filename, "wb"); + file = g_fopen (data->filename, "wb"); if (! file) { @@ -134,7 +134,7 @@ gimp_gradient_save_as_pov (GimpGradient *gradient, g_return_val_if_fail (filename != NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - file = fopen (filename, "wb"); + file = g_fopen (filename, "wb"); if (! file) { diff --git a/app/core/gimppalette-import.c b/app/core/gimppalette-import.c index 9ba1c33312..5a8dc8f462 100644 --- a/app/core/gimppalette-import.c +++ b/app/core/gimppalette-import.c @@ -25,11 +25,11 @@ #include #endif -#include #include #include #include +#include #ifdef G_OS_WIN32 #include "libgimpbase/gimpwin32-io.h" @@ -389,7 +389,7 @@ gimp_palette_detect_file_format (const gchar *filename) guchar header[16]; struct stat file_stat; - fd = open (filename, O_RDONLY); + fd = g_open (filename, O_RDONLY, 0); if (fd) { if (read (fd, header, sizeof (header)) == sizeof (header)) @@ -433,7 +433,7 @@ gimp_palette_import_from_file (const gchar *filename, g_return_val_if_fail (palette_name != NULL, NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL); - fd = open (filename, O_RDONLY); + fd = g_open (filename, O_RDONLY, 0); if (! fd) { g_set_error (error, diff --git a/app/core/gimppalette-load.c b/app/core/gimppalette-load.c index 31c4897831..256bb4ee1c 100644 --- a/app/core/gimppalette-load.c +++ b/app/core/gimppalette-load.c @@ -19,14 +19,15 @@ #include "config.h" #include -#include #include #include + #ifdef HAVE_UNISTD_H #include #endif #include +#include #include "libgimpbase/gimpbase.h" #include "libgimpcolor/gimpcolor.h" @@ -352,7 +353,7 @@ gimp_palette_load (const gchar *filename, r = g = b = 0; - file = fopen (filename, "r"); + file = g_fopen (filename, "r"); if (! file) { @@ -559,7 +560,7 @@ gimp_palette_save (GimpData *data, GList *list; FILE *file; - file = fopen (data->filename, "w"); + file = g_fopen (data->filename, "w"); if (! file) { diff --git a/app/core/gimppalette-save.c b/app/core/gimppalette-save.c index 31c4897831..256bb4ee1c 100644 --- a/app/core/gimppalette-save.c +++ b/app/core/gimppalette-save.c @@ -19,14 +19,15 @@ #include "config.h" #include -#include #include #include + #ifdef HAVE_UNISTD_H #include #endif #include +#include #include "libgimpbase/gimpbase.h" #include "libgimpcolor/gimpcolor.h" @@ -352,7 +353,7 @@ gimp_palette_load (const gchar *filename, r = g = b = 0; - file = fopen (filename, "r"); + file = g_fopen (filename, "r"); if (! file) { @@ -559,7 +560,7 @@ gimp_palette_save (GimpData *data, GList *list; FILE *file; - file = fopen (data->filename, "w"); + file = g_fopen (data->filename, "w"); if (! file) { diff --git a/app/core/gimppalette.c b/app/core/gimppalette.c index 31c4897831..256bb4ee1c 100644 --- a/app/core/gimppalette.c +++ b/app/core/gimppalette.c @@ -19,14 +19,15 @@ #include "config.h" #include -#include #include #include + #ifdef HAVE_UNISTD_H #include #endif #include +#include #include "libgimpbase/gimpbase.h" #include "libgimpcolor/gimpcolor.h" @@ -352,7 +353,7 @@ gimp_palette_load (const gchar *filename, r = g = b = 0; - file = fopen (filename, "r"); + file = g_fopen (filename, "r"); if (! file) { @@ -559,7 +560,7 @@ gimp_palette_save (GimpData *data, GList *list; FILE *file; - file = fopen (data->filename, "w"); + file = g_fopen (data->filename, "w"); if (! file) { diff --git a/app/core/gimppattern-load.c b/app/core/gimppattern-load.c index 172fab2360..a4e5d77bc9 100644 --- a/app/core/gimppattern-load.c +++ b/app/core/gimppattern-load.c @@ -20,18 +20,19 @@ #include #include -#include #include #include #include -#include + #ifdef HAVE_UNISTD_H #include #endif + #include #include +#include #ifdef G_OS_WIN32 #include @@ -321,7 +322,7 @@ gimp_pattern_load (const gchar *filename, g_return_val_if_fail (g_path_is_absolute (filename), NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL); - fd = open (filename, O_RDONLY | _O_BINARY); + fd = g_open (filename, O_RDONLY | _O_BINARY, 0); if (fd == -1) { g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_OPEN, diff --git a/app/core/gimppattern.c b/app/core/gimppattern.c index 172fab2360..a4e5d77bc9 100644 --- a/app/core/gimppattern.c +++ b/app/core/gimppattern.c @@ -20,18 +20,19 @@ #include #include -#include #include #include #include -#include + #ifdef HAVE_UNISTD_H #include #endif + #include #include +#include #ifdef G_OS_WIN32 #include @@ -321,7 +322,7 @@ gimp_pattern_load (const gchar *filename, g_return_val_if_fail (g_path_is_absolute (filename), NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL); - fd = open (filename, O_RDONLY | _O_BINARY); + fd = g_open (filename, O_RDONLY | _O_BINARY, 0); if (fd == -1) { g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_OPEN, diff --git a/app/dialogs/user-install-dialog.c b/app/dialogs/user-install-dialog.c index a84ed03708..31d47d5cef 100644 --- a/app/dialogs/user-install-dialog.c +++ b/app/dialogs/user-install-dialog.c @@ -22,12 +22,13 @@ #include #include #include -#include #include + #ifdef HAVE_UNISTD_H #include #endif +#include #include #ifdef G_OS_WIN32 @@ -1088,10 +1089,10 @@ user_install_mkdir (GtkTextBuffer *log_buffer, while (gtk_events_pending ()) gtk_main_iteration (); - if (mkdir (dirname, - S_IRUSR | S_IWUSR | S_IXUSR | - S_IRGRP | S_IXGRP | - S_IROTH | S_IXOTH) == -1) + if (g_mkdir (dirname, + S_IRUSR | S_IWUSR | S_IXUSR | + S_IRGRP | S_IXGRP | + S_IROTH | S_IXOTH) == -1) { g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), _("Cannot create folder '%s': %s"), diff --git a/app/gui/session.c b/app/gui/session.c index 4e83bdcc97..249291c901 100644 --- a/app/gui/session.c +++ b/app/gui/session.c @@ -22,12 +22,13 @@ #include "config.h" #include -#include #include + #ifdef HAVE_UNISTD_H #include #endif +#include #include #include "libgimpbase/gimpbase.h" @@ -240,7 +241,7 @@ session_clear (Gimp *gimp, filename = session_filename (gimp); - if (unlink (filename) != 0 && errno != ENOENT) + if (g_unlink (filename) != 0 && errno != ENOENT) { g_set_error (error, 0, 0, _("Deleting \"%s\" failed: %s"), gimp_filename_to_utf8 (filename), g_strerror (errno)); diff --git a/app/menus/menus.c b/app/menus/menus.c index c551d0f412..d57b90aec0 100644 --- a/app/menus/menus.c +++ b/app/menus/menus.c @@ -19,10 +19,12 @@ #include "config.h" #include + #ifdef HAVE_UNISTD_H #include #endif +#include #include #include "libgimpbase/gimpbase.h" @@ -366,7 +368,7 @@ menus_clear (Gimp *gimp, filename = gimp_personal_rc_file ("menurc"); - if (unlink (filename) != 0 && errno != ENOENT) + if (g_unlink (filename) != 0 && errno != ENOENT) { g_set_error (error, 0, 0, _("Deleting \"%s\" failed: %s"), gimp_filename_to_utf8 (filename), g_strerror (errno)); diff --git a/app/plug-in/gimpenvirontable.c b/app/plug-in/gimpenvirontable.c index 1ded61d0e3..d0a289e931 100644 --- a/app/plug-in/gimpenvirontable.c +++ b/app/plug-in/gimpenvirontable.c @@ -21,11 +21,11 @@ #include "config.h" -#include #include #include #include +#include #include "libgimpbase/gimpbase.h" @@ -229,7 +229,7 @@ gimp_environ_table_get_envp (GimpEnvironTable *environ_table) /* Hmm.. should we return a copy here in the future? Not thread safe atm, * but the rest of it isn't either. - */ + */ if (! environ_table->envp) gimp_environ_table_populate (environ_table); @@ -253,7 +253,7 @@ gimp_environ_table_load_env_file (const GimpDatafileData *file_data, environ_table = GIMP_ENVIRON_TABLE (user_data); - env = fopen (file_data->filename, "r"); + env = g_fopen (file_data->filename, "r"); if (! env) return; @@ -377,7 +377,7 @@ gimp_environ_table_populate (GimpEnvironTable *environ_table) #ifdef ENVP_DEBUG var = environ_table->envp; - g_print ("GimpEnvironTable:\n"); + g_print ("GimpEnvironTable:\n"); while (*var) { g_print ("%s\n", *var); diff --git a/app/widgets/gimpdevices.c b/app/widgets/gimpdevices.c index 521fa5e221..e68fdca52c 100644 --- a/app/widgets/gimpdevices.c +++ b/app/widgets/gimpdevices.c @@ -19,10 +19,12 @@ #include "config.h" #include + #ifdef HAVE_UNISTD_H #include #endif +#include #include #include "libgimpcolor/gimpcolor.h" @@ -211,7 +213,7 @@ gimp_devices_clear (Gimp *gimp, filename = gimp_personal_rc_file ("devicerc"); - if (unlink (filename) != 0 && errno != ENOENT) + if (g_unlink (filename) != 0 && errno != ENOENT) { g_set_error (error, 0, 0, _("Deleting \"%s\" failed: %s"), gimp_filename_to_utf8 (filename), g_strerror (errno));