From 4f18f83ce9a46c58720e0ed65074bd60f92b0e29 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Wed, 3 Oct 2012 17:29:01 +0300 Subject: Use GLib's g_fopen() and g_open() when working with files On Windows, the GLib wrappers for fopen() and open() deal with the UTF-8 format used for file names when we have to open or save a file with unicode characters in its name. Signed-off-by: Lubomir I. Ivanov Signed-off-by: Dirk Hohndel --- file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'file.c') diff --git a/file.c b/file.c index 943be6f09..df00ea213 100644 --- a/file.c +++ b/file.c @@ -22,7 +22,7 @@ static int readfile(const char *filename, struct memblock *mem) mem->buffer = NULL; mem->size = 0; - fd = open(filename, O_RDONLY | O_BINARY); + fd = g_open(filename, O_RDONLY | O_BINARY, 0); if (fd < 0) return fd; ret = fstat(fd, &st); @@ -257,7 +257,7 @@ void parse_file(const char *filename, GError **error) if (default_filename && ! strcmp(filename, default_filename)) return; - fprintf(stderr, "Failed to read '%s'.\n", filename); + g_warning("Failed to read '%s'.\n", filename); if (error) { *error = g_error_new(g_quark_from_string("subsurface"), DIVE_ERROR_PARSE, -- cgit v1.2.3-70-g09d2