summaryrefslogtreecommitdiffstats
path: root/mpvcore
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-10-13 01:16:30 +0200
committerwm4 <wm4@nowhere>2013-10-13 01:16:30 +0200
commitc613d802bc5d87a7be031aaf97996d96bd8af909 (patch)
tree5f18f9ceaf51cb077861099def7dabe3422676f3 /mpvcore
parent8d5f800567d81665820d308b7f2d482c18c51e15 (diff)
downloadmpv-c613d802bc5d87a7be031aaf97996d96bd8af909.tar.bz2
mpv-c613d802bc5d87a7be031aaf97996d96bd8af909.tar.xz
talloc: change talloc destructor signature
Change talloc destructor so that they can never signal failure, and don't return a status code. This makes our talloc copy even more incompatible to upstream talloc, but on the other hand this is preparation for getting rid of talloc entirely. (The talloc replacement in the next commit won't allow the talloc_free equivalent to fail, and the destructor return value would be useless. But I don't want to change any mpv code either; the idea is that the talloc replacement commit can be reverted for some time in order to test whether the talloc replacement introduced a regression.)
Diffstat (limited to 'mpvcore')
-rw-r--r--mpvcore/m_config.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/mpvcore/m_config.c b/mpvcore/m_config.c
index d01d0ed07c..d54940ba5f 100644
--- a/mpvcore/m_config.c
+++ b/mpvcore/m_config.c
@@ -180,13 +180,12 @@ static void add_options(struct m_config *config,
struct m_config_option *parent,
const struct m_option *defs);
-static int config_destroy(void *p)
+static void config_destroy(void *p)
{
struct m_config *config = p;
m_config_restore_backups(config);
for (struct m_config_option *copt = config->opts; copt; copt = copt->next)
m_option_free(copt->opt, copt->data);
- return 0;
}
struct m_config *m_config_new(void *talloc_parent, size_t size,