diff options
author | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2011-01-20 11:59:46 +0000 |
---|---|---|
committer | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2011-01-20 11:59:46 +0000 |
commit | 33b37afeab6180e4fdc3c97f7f6cc713686ac6a9 (patch) | |
tree | feb641941e4fbd0db11bf70415fee5e3be50a08a /src/parse/properties/background.c | |
parent | a8537a5405583a4c975b56d95cab8bdd5d406e9f (diff) | |
download | libcss-33b37afeab6180e4fdc3c97f7f6cc713686ac6a9.tar.gz libcss-33b37afeab6180e4fdc3c97f7f6cc713686ac6a9.tar.bz2 |
Ensure there are zero global symbols without css_ or css__ in front of them. This helps prevent confusion if someone else wants a function called parse_background or similar
svn path=/trunk/libcss/; revision=11416
Diffstat (limited to 'src/parse/properties/background.c')
-rw-r--r-- | src/parse/properties/background.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/parse/properties/background.c b/src/parse/properties/background.c index f12fde7..137372e 100644 --- a/src/parse/properties/background.c +++ b/src/parse/properties/background.c @@ -27,7 +27,7 @@ * Post condition: \a *ctx is updated with the next token to process * If the input is invalid, then \a *ctx remains unchanged. */ -css_error parse_background(css_language *c, +css_error css__parse_background(css_language *c, const parserutils_vector *vector, int *ctx, css_style *result) { @@ -118,30 +118,30 @@ css_error parse_background(css_language *c, if (is_css_inherit(c, token)) { error = CSS_INVALID; - goto parse_background_cleanup; + goto css__parse_background_cleanup; } /* Try each property parser in turn, but only if we * haven't already got a value for this property. */ if ((attachment) && - (error = parse_background_attachment(c, vector, ctx, + (error = css__parse_background_attachment(c, vector, ctx, attachment_style)) == CSS_OK) { attachment = false; } else if ((color) && - (error = parse_background_color(c, vector, ctx, + (error = css__parse_background_color(c, vector, ctx, color_style)) == CSS_OK) { color = false; } else if ((image) && - (error = parse_background_image(c, vector, ctx, + (error = css__parse_background_image(c, vector, ctx, image_style)) == CSS_OK) { image = false; } else if ((position) && - (error = parse_background_position(c, vector, ctx, + (error = css__parse_background_position(c, vector, ctx, position_style)) == CSS_OK) { position = false; } else if ((repeat) && - (error = parse_background_repeat(c, vector, ctx, + (error = css__parse_background_repeat(c, vector, ctx, repeat_style)) == CSS_OK) { repeat = false; } @@ -161,7 +161,7 @@ css_error parse_background(css_language *c, CSS_PROP_BACKGROUND_ATTACHMENT, 0, BACKGROUND_ATTACHMENT_SCROLL); if (error != CSS_OK) - goto parse_background_cleanup; + goto css__parse_background_cleanup; } if (color) { @@ -169,7 +169,7 @@ css_error parse_background(css_language *c, CSS_PROP_BACKGROUND_COLOR, 0, BACKGROUND_COLOR_TRANSPARENT); if (error != CSS_OK) - goto parse_background_cleanup; + goto css__parse_background_cleanup; } if (image) { @@ -177,7 +177,7 @@ css_error parse_background(css_language *c, CSS_PROP_BACKGROUND_IMAGE, 0, BACKGROUND_IMAGE_NONE); if (error != CSS_OK) - goto parse_background_cleanup; + goto css__parse_background_cleanup; } if (position) { @@ -186,7 +186,7 @@ css_error parse_background(css_language *c, 0, BACKGROUND_POSITION_HORZ_LEFT | BACKGROUND_POSITION_VERT_TOP); if (error != CSS_OK) - goto parse_background_cleanup; + goto css__parse_background_cleanup; } if (repeat) { @@ -194,28 +194,28 @@ css_error parse_background(css_language *c, CSS_PROP_BACKGROUND_REPEAT, 0, BACKGROUND_REPEAT_REPEAT); if (error != CSS_OK) - goto parse_background_cleanup; + goto css__parse_background_cleanup; } error = css_stylesheet_merge_style(result, attachment_style); if (error != CSS_OK) - goto parse_background_cleanup; + goto css__parse_background_cleanup; error = css_stylesheet_merge_style(result, color_style); if (error != CSS_OK) - goto parse_background_cleanup; + goto css__parse_background_cleanup; error = css_stylesheet_merge_style(result, image_style); if (error != CSS_OK) - goto parse_background_cleanup; + goto css__parse_background_cleanup; error = css_stylesheet_merge_style(result, position_style); if (error != CSS_OK) - goto parse_background_cleanup; + goto css__parse_background_cleanup; error = css_stylesheet_merge_style(result, repeat_style); -parse_background_cleanup: +css__parse_background_cleanup: css_stylesheet_style_destroy(attachment_style); css_stylesheet_style_destroy(color_style); css_stylesheet_style_destroy(image_style); |