diff options
| author | Max Kellermann <max@duempel.org> | 2009-10-20 21:26:28 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-10-20 21:26:28 +0200 |
| commit | 9cd2129eeb22280836e87bfa12389adf4ddb2488 (patch) | |
| tree | ff8dff416b9a9efb54507061f36db4f6edb879c1 | |
| parent | 097e200a97dfda0844c93f53f1c0a1e6f5d07201 (diff) | |
| download | mpd-9cd2129eeb22280836e87bfa12389adf4ddb2488.tar.gz mpd-9cd2129eeb22280836e87bfa12389adf4ddb2488.tar.xz mpd-9cd2129eeb22280836e87bfa12389adf4ddb2488.zip | |
output_init: renamed parameter "error" to "error_r"
It's a double pointer.
| -rw-r--r-- | src/output_control.h | 2 | ||||
| -rw-r--r-- | src/output_init.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/output_control.h b/src/output_control.h index ce3abe3f6..72e3ed468 100644 --- a/src/output_control.h +++ b/src/output_control.h @@ -38,7 +38,7 @@ audio_output_quark(void) bool audio_output_init(struct audio_output *ao, const struct config_param *param, - GError **error); + GError **error_r); /** * Opens or closes the device, depending on the "enabled" flag. diff --git a/src/output_init.c b/src/output_init.c index 66444e9a5..b139ec0fd 100644 --- a/src/output_init.c +++ b/src/output_init.c @@ -121,7 +121,7 @@ audio_output_load_mixer(const struct config_param *param, bool audio_output_init(struct audio_output *ao, const struct config_param *param, - GError **error) + GError **error_r) { const struct audio_output_plugin *plugin = NULL; @@ -130,14 +130,14 @@ audio_output_init(struct audio_output *ao, const struct config_param *param, p = config_get_block_string(param, AUDIO_OUTPUT_TYPE, NULL); if (p == NULL) { - g_set_error(error, audio_output_quark(), 0, + g_set_error(error_r, audio_output_quark(), 0, "Missing \"type\" configuration"); return false; } plugin = audio_output_plugin_get(p); if (plugin == NULL) { - g_set_error(error, audio_output_quark(), 0, + g_set_error(error_r, audio_output_quark(), 0, "No such audio output plugin: %s", p); return false; } @@ -145,7 +145,7 @@ audio_output_init(struct audio_output *ao, const struct config_param *param, ao->name = config_get_block_string(param, AUDIO_OUTPUT_NAME, NULL); if (ao->name == NULL) { - g_set_error(error, audio_output_quark(), 0, + g_set_error(error_r, audio_output_quark(), 0, "Missing \"name\" configuration"); return false; } @@ -156,7 +156,7 @@ audio_output_init(struct audio_output *ao, const struct config_param *param, if (p != NULL) { bool success = audio_format_parse(&ao->out_audio_format, - p, error); + p, error_r); if (!success) return false; } @@ -164,7 +164,7 @@ audio_output_init(struct audio_output *ao, const struct config_param *param, g_warning("No \"%s\" defined in config file\n", CONF_AUDIO_OUTPUT); - plugin = audio_output_detect(error); + plugin = audio_output_detect(error_r); if (plugin == NULL) return false; @@ -194,7 +194,7 @@ audio_output_init(struct audio_output *ao, const struct config_param *param, ao->data = ao_plugin_init(plugin, ao->config_audio_format ? &ao->out_audio_format : NULL, - param, error); + param, error_r); if (ao->data == NULL) return false; |