diff options
Diffstat (limited to '')
| -rw-r--r-- | src/audio_parser.c | 17 | ||||
| -rw-r--r-- | src/audio_parser.h | 5 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/audio_parser.c b/src/audio_parser.c index d29f5f449..2f38e23f6 100644 --- a/src/audio_parser.c +++ b/src/audio_parser.c @@ -37,7 +37,8 @@ audio_parser_quark(void) } bool -audio_format_parse(struct audio_format *dest, const char *src, GError **error) +audio_format_parse(struct audio_format *dest, const char *src, + GError **error_r) { char *endptr; unsigned long value; @@ -50,15 +51,15 @@ audio_format_parse(struct audio_format *dest, const char *src, GError **error) value = strtoul(src, &endptr, 10); if (endptr == src) { - g_set_error(error, audio_parser_quark(), 0, + g_set_error(error_r, audio_parser_quark(), 0, "Sample rate missing"); return false; } else if (*endptr != ':') { - g_set_error(error, audio_parser_quark(), 0, + g_set_error(error_r, audio_parser_quark(), 0, "Sample format missing"); return false; } else if (!audio_valid_sample_rate(value)) { - g_set_error(error, audio_parser_quark(), 0, + g_set_error(error_r, audio_parser_quark(), 0, "Invalid sample rate: %lu", value); return false; } @@ -70,15 +71,15 @@ audio_format_parse(struct audio_format *dest, const char *src, GError **error) src = endptr + 1; value = strtoul(src, &endptr, 10); if (endptr == src) { - g_set_error(error, audio_parser_quark(), 0, + g_set_error(error_r, audio_parser_quark(), 0, "Sample format missing"); return false; } else if (*endptr != ':') { - g_set_error(error, audio_parser_quark(), 0, + g_set_error(error_r, audio_parser_quark(), 0, "Channel count missing"); return false; } else if (!audio_valid_sample_format(value)) { - g_set_error(error, audio_parser_quark(), 0, + g_set_error(error_r, audio_parser_quark(), 0, "Invalid sample format: %lu", value); return false; } @@ -90,7 +91,7 @@ audio_format_parse(struct audio_format *dest, const char *src, GError **error) src = endptr + 1; value = strtoul(src, &endptr, 10); if (*endptr != 0 || !audio_valid_channel_count(value)) { - g_set_error(error, audio_parser_quark(), 0, + g_set_error(error_r, audio_parser_quark(), 0, "Invalid channel count: %s", src); return false; } diff --git a/src/audio_parser.h b/src/audio_parser.h index 30a927456..1d821eaf5 100644 --- a/src/audio_parser.h +++ b/src/audio_parser.h @@ -37,11 +37,12 @@ struct audio_format; * * @param dest the destination #audio_format struct * @param src the input string - * @param error location to store the error occuring, or NULL to + * @param error_r location to store the error occuring, or NULL to * ignore errors * @return true on success */ bool -audio_format_parse(struct audio_format *dest, const char *src, GError **error); +audio_format_parse(struct audio_format *dest, const char *src, + GError **error_r); #endif |