From 5016839b90274017696e0942f424d4f361d39ea2 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 6 Mar 2012 22:06:08 +0100 Subject: use g_strerror() instead of strerror() Make sure we get a UTF-8 encoded string. --- src/aiff.c | 2 +- src/command.c | 3 ++- src/conf.c | 2 +- src/output/ao_output_plugin.c | 2 +- src/output/fifo_output_plugin.c | 12 ++++++------ src/output/mvp_output_plugin.c | 14 +++++++------- src/output/oss_output_plugin.c | 10 +++++----- src/riff.c | 2 +- src/state_file.c | 4 ++-- src/tag_id3.c | 2 +- test/run_filter.c | 2 +- test/signals.c | 2 +- 12 files changed, 29 insertions(+), 28 deletions(-) diff --git a/src/aiff.c b/src/aiff.c index 35b716eef..06de9ffe7 100644 --- a/src/aiff.c +++ b/src/aiff.c @@ -57,7 +57,7 @@ aiff_seek_id3(FILE *file) ret = fstat(fileno(file), &st); if (ret < 0) { g_warning("Failed to stat file descriptor: %s", - strerror(errno)); + g_strerror(errno)); return 0; } diff --git a/src/command.c b/src/command.c index ad64d9b8d..4641f671b 100644 --- a/src/command.c +++ b/src/command.c @@ -117,7 +117,8 @@ print_playlist_result(struct client *client, return COMMAND_RETURN_OK; case PLAYLIST_RESULT_ERRNO: - command_error(client, ACK_ERROR_SYSTEM, "%s", strerror(errno)); + command_error(client, ACK_ERROR_SYSTEM, "%s", + g_strerror(errno)); return COMMAND_RETURN_ERROR; case PLAYLIST_RESULT_DENIED: diff --git a/src/conf.c b/src/conf.c index 66d8b2643..549ff51ef 100644 --- a/src/conf.c +++ b/src/conf.c @@ -350,7 +350,7 @@ config_read_file(const char *file, GError **error_r) if (!(fp = fopen(file, "r"))) { g_set_error(error_r, config_quark(), errno, "Failed to open %s: %s", - file, strerror(errno)); + file, g_strerror(errno)); return false; } diff --git a/src/output/ao_output_plugin.c b/src/output/ao_output_plugin.c index c0790681e..d7e577fa4 100644 --- a/src/output/ao_output_plugin.c +++ b/src/output/ao_output_plugin.c @@ -74,7 +74,7 @@ ao_output_error(GError **error_r) break; default: - error = strerror(errno); + error = g_strerror(errno); } g_set_error(error_r, ao_output_quark(), errno, diff --git a/src/output/fifo_output_plugin.c b/src/output/fifo_output_plugin.c index b8f405624..022be0b4a 100644 --- a/src/output/fifo_output_plugin.c +++ b/src/output/fifo_output_plugin.c @@ -83,7 +83,7 @@ static void fifo_delete(struct fifo_data *fd) if (unlink(fd->path) < 0) { g_warning("Could not remove FIFO \"%s\": %s", - fd->path, strerror(errno)); + fd->path, g_strerror(errno)); return; } @@ -115,7 +115,7 @@ fifo_make(struct fifo_data *fd, GError **error) if (mkfifo(fd->path, 0666) < 0) { g_set_error(error, fifo_output_quark(), errno, "Couldn't create FIFO \"%s\": %s", - fd->path, strerror(errno)); + fd->path, g_strerror(errno)); return false; } @@ -137,7 +137,7 @@ fifo_check(struct fifo_data *fd, GError **error) g_set_error(error, fifo_output_quark(), errno, "Failed to stat FIFO \"%s\": %s", - fd->path, strerror(errno)); + fd->path, g_strerror(errno)); return false; } @@ -161,7 +161,7 @@ fifo_open(struct fifo_data *fd, GError **error) if (fd->input < 0) { g_set_error(error, fifo_output_quark(), errno, "Could not open FIFO \"%s\" for reading: %s", - fd->path, strerror(errno)); + fd->path, g_strerror(errno)); fifo_close(fd); return false; } @@ -170,7 +170,7 @@ fifo_open(struct fifo_data *fd, GError **error) if (fd->output < 0) { g_set_error(error, fifo_output_quark(), errno, "Could not open FIFO \"%s\" for writing: %s", - fd->path, strerror(errno)); + fd->path, g_strerror(errno)); fifo_close(fd); return false; } @@ -255,7 +255,7 @@ fifo_output_cancel(struct audio_output *ao) if (bytes < 0 && errno != EAGAIN) { g_warning("Flush of FIFO \"%s\" failed: %s", - fd->path, strerror(errno)); + fd->path, g_strerror(errno)); } } diff --git a/src/output/mvp_output_plugin.c b/src/output/mvp_output_plugin.c index aec09248f..37e0f7c93 100644 --- a/src/output/mvp_output_plugin.c +++ b/src/output/mvp_output_plugin.c @@ -128,7 +128,7 @@ mvp_output_test_default_device(void) } g_warning("Error opening PCM device \"/dev/adec_pcm\": %s\n", - strerror(errno)); + g_strerror(errno)); return false; } @@ -245,32 +245,32 @@ mvp_output_open(struct audio_output *ao, struct audio_format *audio_format, if (md->fd < 0) { g_set_error(error, mvp_output_quark(), errno, "Error opening /dev/adec_pcm: %s", - strerror(errno)); + g_strerror(errno)); return false; } if (ioctl(md->fd, MVP_SET_AUD_SRC, 1) < 0) { g_set_error(error, mvp_output_quark(), errno, "Error setting audio source: %s", - strerror(errno)); + g_strerror(errno)); return false; } if (ioctl(md->fd, MVP_SET_AUD_STREAMTYPE, 0) < 0) { g_set_error(error, mvp_output_quark(), errno, "Error setting audio streamtype: %s", - strerror(errno)); + g_strerror(errno)); return false; } if (ioctl(md->fd, MVP_SET_AUD_FORMAT, &mix) < 0) { g_set_error(error, mvp_output_quark(), errno, "Error setting audio format: %s", - strerror(errno)); + g_strerror(errno)); return false; } ioctl(md->fd, MVP_SET_AUD_STC, &stc); if (ioctl(md->fd, MVP_SET_AUD_BYPASS, 1) < 0) { g_set_error(error, mvp_output_quark(), errno, "Error setting audio streamtype: %s", - strerror(errno)); + g_strerror(errno)); return false; } @@ -326,7 +326,7 @@ mvp_output_play(struct audio_output *ao, const void *chunk, size_t size, continue; g_set_error(error, mvp_output_quark(), errno, - "Failed to write: %s", strerror(errno)); + "Failed to write: %s", g_strerror(errno)); return 0; } } diff --git a/src/output/oss_output_plugin.c b/src/output/oss_output_plugin.c index b2b491c9c..f98d01914 100644 --- a/src/output/oss_output_plugin.c +++ b/src/output/oss_output_plugin.c @@ -139,7 +139,7 @@ oss_output_test_default_device(void) return true; } g_warning("Error opening OSS device \"%s\": %s\n", - default_devices[i], strerror(errno)); + default_devices[i], g_strerror(errno)); } return false; @@ -184,7 +184,7 @@ oss_open_default(GError **error) break; case OSS_STAT_OTHER: g_warning("Error accessing %s: %s\n", - dev, strerror(err[i])); + dev, g_strerror(err[i])); } } @@ -578,7 +578,7 @@ oss_reopen(struct oss_data *od, GError **error_r) if (od->fd < 0) { g_set_error(error_r, oss_output_quark(), errno, "Error opening OSS device \"%s\": %s", - od->device, strerror(errno)); + od->device, g_strerror(errno)); return false; } @@ -632,7 +632,7 @@ oss_output_open(struct audio_output *ao, struct audio_format *audio_format, if (od->fd < 0) { g_set_error(error, oss_output_quark(), errno, "Error opening OSS device \"%s\": %s", - od->device, strerror(errno)); + od->device, g_strerror(errno)); return false; } @@ -683,7 +683,7 @@ oss_output_play(struct audio_output *ao, const void *chunk, size_t size, if (ret < 0 && errno != EINTR) { g_set_error(error, oss_output_quark(), errno, "Write error on %s: %s", - od->device, strerror(errno)); + od->device, g_strerror(errno)); return 0; } } diff --git a/src/riff.c b/src/riff.c index 670fb55f5..9ee916971 100644 --- a/src/riff.c +++ b/src/riff.c @@ -57,7 +57,7 @@ riff_seek_id3(FILE *file) ret = fstat(fileno(file), &st); if (ret < 0) { g_warning("Failed to stat file descriptor: %s", - strerror(errno)); + g_strerror(errno)); return 0; } diff --git a/src/state_file.c b/src/state_file.c index d7dde6583..de7fa2d02 100644 --- a/src/state_file.c +++ b/src/state_file.c @@ -58,7 +58,7 @@ state_file_write(struct player_control *pc) fp = fopen(state_file_path, "w"); if (G_UNLIKELY(!fp)) { g_warning("failed to create %s: %s", - state_file_path, strerror(errno)); + state_file_path, g_strerror(errno)); return; } @@ -86,7 +86,7 @@ state_file_read(struct player_control *pc) fp = fopen(state_file_path, "r"); if (G_UNLIKELY(!fp)) { g_warning("failed to open %s: %s", - state_file_path, strerror(errno)); + state_file_path, g_strerror(errno)); return; } diff --git a/src/tag_id3.c b/src/tag_id3.c index 394068d3f..c98179f0a 100644 --- a/src/tag_id3.c +++ b/src/tag_id3.c @@ -551,7 +551,7 @@ tag_id3_scan(const char *path_fs, stream = fopen(path_fs, "rb"); if (!stream) { g_debug("tag_id3_load: Failed to open file: '%s', %s", - path_fs, strerror(errno)); + path_fs, g_strerror(errno)); return false; } diff --git a/test/run_filter.c b/test/run_filter.c index d1dffc190..8e793b768 100644 --- a/test/run_filter.c +++ b/test/run_filter.c @@ -183,7 +183,7 @@ int main(int argc, char **argv) nbytes = write(1, dest, length); if (nbytes < 0) { - g_printerr("Failed to write: %s\n", strerror(errno)); + g_printerr("Failed to write: %s\n", g_strerror(errno)); filter_close(filter); filter_free(filter); return 1; diff --git a/test/signals.c b/test/signals.c index 5f5d336f3..15761f6b0 100644 --- a/test/signals.c +++ b/test/signals.c @@ -39,7 +39,7 @@ static void x_sigaction(int signum, const struct sigaction *act) { if (sigaction(signum, act, NULL) < 0) - MPD_ERROR("sigaction() failed: %s", strerror(errno)); + MPD_ERROR("sigaction() failed: %s", g_strerror(errno)); } #endif -- cgit v1.2.3