summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Bursa <james@netsurf-browser.org>2005-02-19 23:40:15 +0000
committerJames Bursa <james@netsurf-browser.org>2005-02-19 23:40:15 +0000
commitd249f20d1efc2d19dc2d9c5ce8a960aa3f1f61da (patch)
tree5a47f6367c3751fcbcc51303e1ad041ffa23d95c
parent5a9cfb6e7e931e912cd3c2c7a2ccd872d5041bfc (diff)
downloadnetsurf-d249f20d1efc2d19dc2d9c5ce8a960aa3f1f61da.tar.gz
netsurf-d249f20d1efc2d19dc2d9c5ce8a960aa3f1f61da.tar.bz2
[project @ 2005-02-19 23:40:15 by bursa]
Add const qualifiers to css_len2px arguments. svn path=/import/netsurf/; revision=1516
-rw-r--r--css/css.c9
-rw-r--r--css/css.h9
2 files changed, 10 insertions, 8 deletions
diff --git a/css/css.c b/css/css.c
index 65bbbe474..19e525e2b 100644
--- a/css/css.c
+++ b/css/css.c
@@ -135,7 +135,7 @@ const struct css_style css_base_style = {
0x000000,
{ CSS_CONTENT_NORMAL, 0 },
{ CSS_COUNTER_RESET_NONE, 0 },
- { CSS_COUNTER_INCREMENT_NONE, 0 },
+ { CSS_COUNTER_INCREMENT_NONE, 0 },
CSS_CURSOR_AUTO,
CSS_DIRECTION_LTR,
CSS_DISPLAY_BLOCK,
@@ -220,7 +220,7 @@ const struct css_style css_empty_style = {
CSS_COLOR_NOT_SET,
{ CSS_CONTENT_NOT_SET, 0 },
{ CSS_COUNTER_RESET_NOT_SET, 0 },
- { CSS_COUNTER_INCREMENT_NOT_SET, 0 },
+ { CSS_COUNTER_INCREMENT_NOT_SET, 0 },
CSS_CURSOR_NOT_SET,
CSS_DIRECTION_NOT_SET,
CSS_DISPLAY_NOT_SET,
@@ -306,7 +306,7 @@ const struct css_style css_blank_style = {
CSS_COLOR_INHERIT,
{ CSS_CONTENT_NORMAL, 0 },
{ CSS_COUNTER_RESET_NONE, 0 },
- { CSS_COUNTER_INCREMENT_NONE, 0 },
+ { CSS_COUNTER_INCREMENT_NONE, 0 },
CSS_CURSOR_INHERIT,
CSS_DIRECTION_INHERIT,
CSS_DISPLAY_INLINE,
@@ -2843,7 +2843,8 @@ unsigned int css_hash(const char *s, int length)
* Convert a struct css_length to pixels.
*/
-float css_len2px(struct css_length * length, struct css_style * style)
+float css_len2px(const struct css_length *length,
+ const struct css_style *style)
{
assert(!((length->unit == CSS_UNIT_EM || length->unit == CSS_UNIT_EX) && style == 0));
switch (length->unit) {
diff --git a/css/css.h b/css/css.h
index d795ff17a..d9701cbbe 100644
--- a/css/css.h
+++ b/css/css.h
@@ -129,7 +129,7 @@ struct css_counter_control {
int value;
struct css_counter_control *next;
};
-
+
struct css_counter {
char *name;
css_list_style_type style;
@@ -203,7 +203,7 @@ struct css_style {
CSS_CONTENT_NOT_SET } type;
struct css_content *content;
} content;
-
+
/* counter controls */
struct {
enum {
@@ -605,7 +605,7 @@ int css_tokenise(unsigned char **buffer, unsigned char *end,
unsigned char **token_text);
void css_parser_Trace(FILE *TraceFILE, char *zTracePrompt);
-void *css_parser_Alloc(void *(*mallocProc)(/*size_t*/ int));
+void *css_parser_Alloc(void *(*mallocProc)(size_t));
void css_parser_Free(void *p, void (*freeProc)(void*));
void css_parser_(void *yyp, int yymajor, struct css_parser_token yyminor,
struct css_parser_params *param);
@@ -628,6 +628,7 @@ colour named_colour(const char *name);
void css_dump_style(const struct css_style * const style);
void css_dump_stylesheet(const struct css_stylesheet * stylesheet);
-float css_len2px(struct css_length * length, struct css_style * style);
+float css_len2px(const struct css_length *length,
+ const struct css_style *style);
#endif