From 03824fd772e44b4cd281dd893df07d991cac9e41 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 2 Nov 2015 22:21:53 +0000 Subject: Remove redundant API surface. --- src/select/computed.c | 6 +++--- src/select/computed.h | 6 ++++++ src/select/select.c | 10 +++++----- 3 files changed, 14 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/select/computed.c b/src/select/computed.c index 1fe6a81..2efc8a7 100644 --- a/src/select/computed.c +++ b/src/select/computed.c @@ -65,7 +65,7 @@ static css_error compute_absolute_length_pair(css_computed_style *style, * CSS_NOMEM on memory exhaustion, * CSS_BADPARM on bad parameters. */ -css_error css_computed_style_create(css_computed_style **result) +css_error css__computed_style_create(css_computed_style **result) { css_computed_style *s; @@ -239,7 +239,7 @@ css_error css_computed_style_destroy(css_computed_style *style) * \param pw Client-specific private data for handler functions * \return CSS_OK on success. */ -css_error css_computed_style_initialise(css_computed_style *style, +css_error css__computed_style_initialise(css_computed_style *style, css_select_handler *handler, void *pw) { css_select_state state; @@ -300,7 +300,7 @@ css_error css_computed_style_compose( * to avoid the churn of unnecesaraly allocating and freeing * the memory to compose styles into. */ - error = css_computed_style_create(&composed); + error = css__computed_style_create(&composed); if (error != CSS_OK) { return error; } diff --git a/src/select/computed.h b/src/select/computed.h index 230711d..57981b2 100644 --- a/src/select/computed.h +++ b/src/select/computed.h @@ -342,6 +342,12 @@ static inline css_computed_style * css__computed_style_ref( return style; } +css_error css__computed_style_create(css_computed_style **result); + +css_error css__computed_style_initialise(css_computed_style *style, + struct css_select_handler *handler, void *pw); + + css_error css__computed_uncommon_destroy(css_computed_uncommon *uncommon); css_error css__compute_absolute_values(const css_computed_style *parent, diff --git a/src/select/select.c b/src/select/select.c index a1ec746..f2cb6d5 100644 --- a/src/select/select.c +++ b/src/select/select.c @@ -429,11 +429,11 @@ static css_error css__select_ctx_create_default_style(css_select_ctx *ctx, css_error error; /* Need to construct the default style */ - error = css_computed_style_create(&style); + error = css__computed_style_create(&style); if (error != CSS_OK) return error; - error = css_computed_style_initialise(style, handler, pw); + error = css__computed_style_initialise(style, handler, pw); if (error != CSS_OK) { css_computed_style_destroy(style); return error; @@ -543,7 +543,7 @@ css_error css_select_style(css_select_ctx *ctx, void *node, state.results->styles[i] = NULL; /* Base element style is guaranteed to exist */ - error = css_computed_style_create( + error = css__computed_style_create( &state.results->styles[CSS_PSEUDO_ELEMENT_NONE]); if (error != CSS_OK) { free(state.results); @@ -626,7 +626,7 @@ css_error css_select_style(css_select_ctx *ctx, void *node, struct css_computed_style *computed_style = state.results->styles[CSS_PSEUDO_ELEMENT_NONE]; if (computed_style == NULL) { - error = css_computed_style_create(&computed_style); + error = css__computed_style_create(&computed_style); if (error != CSS_OK) goto cleanup; } @@ -1799,7 +1799,7 @@ css_error match_selector_chain(css_select_ctx *ctx, /* Ensure that the appropriate computed style exists */ if (state->results->styles[pseudo] == NULL) { - error = css_computed_style_create( + error = css__computed_style_create( &state->results->styles[pseudo]); if (error != CSS_OK) return error; -- cgit v1.2.3