diff options
Diffstat (limited to 'src/select')
-rw-r--r-- | src/select/hash.c | 18 | ||||
-rw-r--r-- | src/select/hash.h | 18 | ||||
-rw-r--r-- | src/select/properties/content.c | 4 | ||||
-rw-r--r-- | src/select/properties/cursor.c | 2 | ||||
-rw-r--r-- | src/select/properties/font_family.c | 2 | ||||
-rw-r--r-- | src/select/properties/helpers.c | 4 | ||||
-rw-r--r-- | src/select/properties/play_during.c | 2 | ||||
-rw-r--r-- | src/select/properties/quotes.c | 4 | ||||
-rw-r--r-- | src/select/properties/voice_family.c | 2 | ||||
-rw-r--r-- | src/select/select.c | 8 |
10 files changed, 32 insertions, 32 deletions
diff --git a/src/select/hash.c b/src/select/hash.c index ed956a0..d68ad82 100644 --- a/src/select/hash.c +++ b/src/select/hash.c @@ -70,7 +70,7 @@ static css_error _iterate_universal(css_selector_hash *hash, * \param hash Pointer to location to receive result * \return CSS_OK on success, appropriate error otherwise */ -css_error css_selector_hash_create(css_allocator_fn alloc, void *pw, +css_error css__selector_hash_create(css_allocator_fn alloc, void *pw, css_selector_hash **hash) { css_selector_hash *h; @@ -134,7 +134,7 @@ css_error css_selector_hash_create(css_allocator_fn alloc, void *pw, * \param hash The hash to destroy * \return CSS_OK on success, appropriate error otherwise */ -css_error css_selector_hash_destroy(css_selector_hash *hash) +css_error css__selector_hash_destroy(css_selector_hash *hash) { hash_entry *d, *e; uint32_t i; @@ -191,7 +191,7 @@ css_error css_selector_hash_destroy(css_selector_hash *hash) * \param selector Pointer to selector * \return CSS_OK on success, appropriate error otherwise */ -css_error css_selector_hash_insert(css_selector_hash *hash, +css_error css__selector_hash_insert(css_selector_hash *hash, const css_selector *selector) { uint32_t index, mask; @@ -239,7 +239,7 @@ css_error css_selector_hash_insert(css_selector_hash *hash, * \param selector Pointer to selector * \return CSS_OK on success, appropriate error otherwise */ -css_error css_selector_hash_remove(css_selector_hash *hash, +css_error css__selector_hash_remove(css_selector_hash *hash, const css_selector *selector) { uint32_t index, mask; @@ -291,7 +291,7 @@ css_error css_selector_hash_remove(css_selector_hash *hash, * * If nothing matches, CSS_OK will be returned and **matched == NULL */ -css_error css_selector_hash_find(css_selector_hash *hash, +css_error css__selector_hash_find(css_selector_hash *hash, lwc_string *name, css_selector_hash_iterator *iterator, const css_selector ***matched) @@ -346,7 +346,7 @@ css_error css_selector_hash_find(css_selector_hash *hash, * * If nothing matches, CSS_OK will be returned and **matched == NULL */ -css_error css_selector_hash_find_by_class(css_selector_hash *hash, +css_error css__selector_hash_find_by_class(css_selector_hash *hash, lwc_string *name, css_selector_hash_iterator *iterator, const css_selector ***matched) @@ -405,7 +405,7 @@ css_error css_selector_hash_find_by_class(css_selector_hash *hash, * * If nothing matches, CSS_OK will be returned and **matched == NULL */ -css_error css_selector_hash_find_by_id(css_selector_hash *hash, +css_error css__selector_hash_find_by_id(css_selector_hash *hash, lwc_string *name, css_selector_hash_iterator *iterator, const css_selector ***matched) @@ -463,7 +463,7 @@ css_error css_selector_hash_find_by_id(css_selector_hash *hash, * * If nothing matches, CSS_OK will be returned and **matched == NULL */ -css_error css_selector_hash_find_universal(css_selector_hash *hash, +css_error css__selector_hash_find_universal(css_selector_hash *hash, css_selector_hash_iterator *iterator, const css_selector ***matched) { @@ -486,7 +486,7 @@ css_error css_selector_hash_find_universal(css_selector_hash *hash, * \note The returned size will represent the size of the hash datastructures, * and will not include the size of the data stored in the hash. */ -css_error css_selector_hash_size(css_selector_hash *hash, size_t *size) +css_error css__selector_hash_size(css_selector_hash *hash, size_t *size) { if (hash == NULL || size == NULL) return CSS_BADPARM; diff --git a/src/select/hash.h b/src/select/hash.h index e1f2542..c8a3d36 100644 --- a/src/select/hash.h +++ b/src/select/hash.h @@ -22,32 +22,32 @@ typedef css_error (*css_selector_hash_iterator)(css_selector_hash *hash, const struct css_selector **current, const struct css_selector ***next); -css_error css_selector_hash_create(css_allocator_fn alloc, void *pw, +css_error css__selector_hash_create(css_allocator_fn alloc, void *pw, css_selector_hash **hash); -css_error css_selector_hash_destroy(css_selector_hash *hash); +css_error css__selector_hash_destroy(css_selector_hash *hash); -css_error css_selector_hash_insert(css_selector_hash *hash, +css_error css__selector_hash_insert(css_selector_hash *hash, const struct css_selector *selector); -css_error css_selector_hash_remove(css_selector_hash *hash, +css_error css__selector_hash_remove(css_selector_hash *hash, const struct css_selector *selector); -css_error css_selector_hash_find(css_selector_hash *hash, +css_error css__selector_hash_find(css_selector_hash *hash, lwc_string *name, css_selector_hash_iterator *iterator, const struct css_selector ***matched); -css_error css_selector_hash_find_by_class(css_selector_hash *hash, +css_error css__selector_hash_find_by_class(css_selector_hash *hash, lwc_string *name, css_selector_hash_iterator *iterator, const struct css_selector ***matched); -css_error css_selector_hash_find_by_id(css_selector_hash *hash, +css_error css__selector_hash_find_by_id(css_selector_hash *hash, lwc_string *name, css_selector_hash_iterator *iterator, const struct css_selector ***matched); -css_error css_selector_hash_find_universal(css_selector_hash *hash, +css_error css__selector_hash_find_universal(css_selector_hash *hash, css_selector_hash_iterator *iterator, const struct css_selector ***matched); -css_error css_selector_hash_size(css_selector_hash *hash, size_t *size); +css_error css__selector_hash_size(css_selector_hash *hash, size_t *size); #endif diff --git a/src/select/properties/content.c b/src/select/properties/content.c index 5e38d49..1d033f2 100644 --- a/src/select/properties/content.c +++ b/src/select/properties/content.c @@ -35,7 +35,7 @@ css_error css__cascade_content(uint32_t opv, css_style *style, lwc_string *he; css_computed_content_item *temp; - css_stylesheet_string_get(style->sheet, *((css_code_t *) style->bytecode), &he); + css__stylesheet_string_get(style->sheet, *((css_code_t *) style->bytecode), &he); temp = state->computed->alloc(content, (n_contents + 1) * @@ -66,7 +66,7 @@ css_error css__cascade_content(uint32_t opv, css_style *style, advance_bytecode(style, sizeof(css_code_t)); - css_stylesheet_string_get(style->sheet, *((css_code_t *) style->bytecode), &sep); + css__stylesheet_string_get(style->sheet, *((css_code_t *) style->bytecode), &sep); advance_bytecode(style, sizeof(css_code_t)); content[n_contents].type = diff --git a/src/select/properties/cursor.c b/src/select/properties/cursor.c index 42c3753..d4785b1 100644 --- a/src/select/properties/cursor.c +++ b/src/select/properties/cursor.c @@ -28,7 +28,7 @@ css_error css__cascade_cursor(uint32_t opv, css_style *style, lwc_string *uri; lwc_string **temp; - css_stylesheet_string_get(style->sheet, *((css_code_t *) style->bytecode), &uri); + css__stylesheet_string_get(style->sheet, *((css_code_t *) style->bytecode), &uri); advance_bytecode(style, sizeof(css_code_t)); temp = state->computed->alloc(uris, diff --git a/src/select/properties/font_family.c b/src/select/properties/font_family.c index f712cdb..8ad36e4 100644 --- a/src/select/properties/font_family.c +++ b/src/select/properties/font_family.c @@ -31,7 +31,7 @@ css_error css__cascade_font_family(uint32_t opv, css_style *style, switch (v) { case FONT_FAMILY_STRING: case FONT_FAMILY_IDENT_LIST: - css_stylesheet_string_get(style->sheet, *((css_code_t *) style->bytecode), &font); + css__stylesheet_string_get(style->sheet, *((css_code_t *) style->bytecode), &font); advance_bytecode(style, sizeof(css_code_t)); break; case FONT_FAMILY_SERIF: diff --git a/src/select/properties/helpers.c b/src/select/properties/helpers.c index 31ef2a7..9635dd8 100644 --- a/src/select/properties/helpers.c +++ b/src/select/properties/helpers.c @@ -93,7 +93,7 @@ css_error css__cascade_uri_none(uint32_t opv, css_style *style, break; case BACKGROUND_IMAGE_URI: value = CSS_BACKGROUND_IMAGE_IMAGE; - css_stylesheet_string_get(style->sheet, *((css_code_t *) style->bytecode), &uri); + css__stylesheet_string_get(style->sheet, *((css_code_t *) style->bytecode), &uri); advance_bytecode(style, sizeof(css_code_t)); break; } @@ -402,7 +402,7 @@ css_error css__cascade_counter_increment_reset(uint32_t opv, css_style *style, lwc_string *name; css_fixed val = 0; - css_stylesheet_string_get(style->sheet, *((css_code_t *) style->bytecode), &name); + css__stylesheet_string_get(style->sheet, *((css_code_t *) style->bytecode), &name); advance_bytecode(style, sizeof(css_code_t)); val = *((css_fixed *) style->bytecode); diff --git a/src/select/properties/play_during.c b/src/select/properties/play_during.c index ab01b6a..cb1de3c 100644 --- a/src/select/properties/play_during.c +++ b/src/select/properties/play_during.c @@ -25,7 +25,7 @@ css_error css__cascade_play_during(uint32_t opv, css_style *style, case PLAY_DURING_URI: value = 0; - css_stylesheet_string_get(style->sheet, *((css_code_t *) style->bytecode), &uri); + css__stylesheet_string_get(style->sheet, *((css_code_t *) style->bytecode), &uri); advance_bytecode(style, sizeof(css_code_t)); break; case PLAY_DURING_AUTO: diff --git a/src/select/properties/quotes.c b/src/select/properties/quotes.c index 5db2184..7671c1d 100644 --- a/src/select/properties/quotes.c +++ b/src/select/properties/quotes.c @@ -30,10 +30,10 @@ css_error css__cascade_quotes(uint32_t opv, css_style *style, lwc_string *open, *close; lwc_string **temp; - css_stylesheet_string_get(style->sheet, *((css_code_t *) style->bytecode), &open); + css__stylesheet_string_get(style->sheet, *((css_code_t *) style->bytecode), &open); advance_bytecode(style, sizeof(css_code_t)); - css_stylesheet_string_get(style->sheet, *((css_code_t *) style->bytecode), &close); + css__stylesheet_string_get(style->sheet, *((css_code_t *) style->bytecode), &close); advance_bytecode(style, sizeof(css_code_t)); temp = state->computed->alloc(quotes, diff --git a/src/select/properties/voice_family.c b/src/select/properties/voice_family.c index dfff826..e61d2c6 100644 --- a/src/select/properties/voice_family.c +++ b/src/select/properties/voice_family.c @@ -31,7 +31,7 @@ css_error css__cascade_voice_family(uint32_t opv, css_style *style, switch (v) { case VOICE_FAMILY_STRING: case VOICE_FAMILY_IDENT_LIST: - css_stylesheet_string_get(style->sheet, *((css_code_t *) style->bytecode), &voice); + css__stylesheet_string_get(style->sheet, *((css_code_t *) style->bytecode), &voice); advance_bytecode(style, sizeof(css_code_t)); break; case VOICE_FAMILY_MALE: diff --git a/src/select/select.c b/src/select/select.c index 0c9fb30..ee34df2 100644 --- a/src/select/select.c +++ b/src/select/select.c @@ -837,7 +837,7 @@ css_error match_selectors_in_sheet(css_select_ctx *ctx, goto cleanup; /* Find hash chain that applies to current node */ - error = css_selector_hash_find(sheet->selectors, element, + error = css__selector_hash_find(sheet->selectors, element, &node_iterator, &node_selectors); if (error != CSS_OK) goto cleanup; @@ -852,7 +852,7 @@ css_error match_selectors_in_sheet(css_select_ctx *ctx, } for (i = 0; i < n_classes; i++) { - error = css_selector_hash_find_by_class( + error = css__selector_hash_find_by_class( sheet->selectors, classes[i], &class_iterator, &class_selectors[i]); if (error != CSS_OK) @@ -862,14 +862,14 @@ css_error match_selectors_in_sheet(css_select_ctx *ctx, if (id != NULL) { /* Find hash chain for node ID */ - error = css_selector_hash_find_by_id(sheet->selectors, id, + error = css__selector_hash_find_by_id(sheet->selectors, id, &id_iterator, &id_selectors); if (error != CSS_OK) goto cleanup; } /* Find hash chain for universal selector */ - error = css_selector_hash_find_universal(sheet->selectors, + error = css__selector_hash_find_universal(sheet->selectors, &univ_iterator, &univ_selectors); if (error != CSS_OK) goto cleanup; |