summaryrefslogtreecommitdiffstats
path: root/src/libcroco/cr-term.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libcroco/cr-term.c')
-rw-r--r--src/libcroco/cr-term.c71
1 files changed, 36 insertions, 35 deletions
diff --git a/src/libcroco/cr-term.c b/src/libcroco/cr-term.c
index 09b6354db..1c50aed2a 100644
--- a/src/libcroco/cr-term.c
+++ b/src/libcroco/cr-term.c
@@ -84,7 +84,9 @@ cr_term_clear (CRTerm * a_this)
CRTerm *
cr_term_new (void)
{
- CRTerm *result = (CRTerm *)g_try_malloc (sizeof (CRTerm));
+ CRTerm *result = NULL;
+
+ result = (CRTerm *) g_try_malloc (sizeof (CRTerm));
if (!result) {
cr_utils_trace_info ("Out of memory");
return NULL;
@@ -104,15 +106,14 @@ CRTerm *
cr_term_parse_expression_from_buf (const guchar * a_buf,
enum CREncoding a_encoding)
{
+ CRParser *parser = NULL;
CRTerm *result = NULL;
enum CRStatus status = CR_OK;
g_return_val_if_fail (a_buf, NULL);
- CRParser *parser = cr_parser_new_from_buf (
- (guchar*)a_buf,
- strlen ((char *)a_buf),
- a_encoding, FALSE);
+ parser = cr_parser_new_from_buf ((guchar*)a_buf, strlen ((const char *) a_buf),
+ a_encoding, FALSE);
g_return_val_if_fail (parser, NULL);
status = cr_parser_try_to_skip_spaces_and_comments (parser);
@@ -279,8 +280,8 @@ cr_term_to_string (CRTerm const * a_this)
{
GString *str_buf = NULL;
CRTerm const *cur = NULL;
- guchar *result = NULL;
- gchar *content = NULL;
+ guchar *result = NULL,
+ *content = NULL;
g_return_val_if_fail (a_this, NULL);
@@ -329,11 +330,11 @@ cr_term_to_string (CRTerm const * a_this)
switch (cur->type) {
case TERM_NUMBER:
if (cur->content.num) {
- content = (gchar *)cr_num_to_string (cur->content.num);
+ content = cr_num_to_string (cur->content.num);
}
if (content) {
- g_string_append (str_buf, content);
+ g_string_append (str_buf, (const gchar *) content);
g_free (content);
content = NULL;
}
@@ -342,7 +343,7 @@ cr_term_to_string (CRTerm const * a_this)
case TERM_FUNCTION:
if (cur->content.str) {
- content = g_strndup
+ content = (guchar *) g_strndup
(cur->content.str->stryng->str,
cur->content.str->stryng->len);
}
@@ -360,22 +361,21 @@ cr_term_to_string (CRTerm const * a_this)
if (tmp_str) {
g_string_append (str_buf,
- (gchar *)tmp_str);
+ (const gchar *) tmp_str);
g_free (tmp_str);
tmp_str = NULL;
}
-
}
+ g_string_append (str_buf, ")");
g_free (content);
content = NULL;
- g_string_append (str_buf, ")");
}
break;
case TERM_STRING:
if (cur->content.str) {
- content = g_strndup
+ content = (guchar *) g_strndup
(cur->content.str->stryng->str,
cur->content.str->stryng->len);
}
@@ -390,13 +390,13 @@ cr_term_to_string (CRTerm const * a_this)
case TERM_IDENT:
if (cur->content.str) {
- content = g_strndup
+ content = (guchar *) g_strndup
(cur->content.str->stryng->str,
cur->content.str->stryng->len);
}
if (content) {
- g_string_append (str_buf, content);
+ g_string_append (str_buf, (const gchar *) content);
g_free (content);
content = NULL;
}
@@ -404,9 +404,9 @@ cr_term_to_string (CRTerm const * a_this)
case TERM_URI:
if (cur->content.str) {
- content = g_strndup
- (cur->content.str->stryng->str,
- cur->content.str->stryng->len);
+ content = (guchar *) g_strndup
+ (cur->content.str->stryng->str,
+ cur->content.str->stryng->len);
}
if (content) {
@@ -425,7 +425,7 @@ cr_term_to_string (CRTerm const * a_this)
tmp_str = cr_rgb_to_string (cur->content.rgb);
if (tmp_str) {
- g_string_append (str_buf, (gchar *)tmp_str);
+ g_string_append (str_buf, (const gchar *) tmp_str);
g_free (tmp_str);
tmp_str = NULL;
}
@@ -442,7 +442,7 @@ cr_term_to_string (CRTerm const * a_this)
case TERM_HASH:
if (cur->content.str) {
- content = g_strndup
+ content = (guchar *) g_strndup
(cur->content.str->stryng->str,
cur->content.str->stryng->len);
}
@@ -463,7 +463,7 @@ cr_term_to_string (CRTerm const * a_this)
}
if (str_buf) {
- result = (guchar *)str_buf->str;
+ result =(guchar *) str_buf->str;
g_string_free (str_buf, FALSE);
str_buf = NULL;
}
@@ -475,8 +475,8 @@ guchar *
cr_term_one_to_string (CRTerm const * a_this)
{
GString *str_buf = NULL;
- guchar *result = NULL;
- gchar *content = NULL;
+ guchar *result = NULL,
+ *content = NULL;
g_return_val_if_fail (a_this, NULL);
@@ -524,11 +524,11 @@ cr_term_one_to_string (CRTerm const * a_this)
switch (a_this->type) {
case TERM_NUMBER:
if (a_this->content.num) {
- content = (gchar *)cr_num_to_string (a_this->content.num);
+ content = cr_num_to_string (a_this->content.num);
}
if (content) {
- g_string_append (str_buf, content);
+ g_string_append (str_buf, (const gchar *) content);
g_free (content);
content = NULL;
}
@@ -537,7 +537,7 @@ cr_term_one_to_string (CRTerm const * a_this)
case TERM_FUNCTION:
if (a_this->content.str) {
- content = g_strndup
+ content = (guchar *) g_strndup
(a_this->content.str->stryng->str,
a_this->content.str->stryng->len);
}
@@ -571,7 +571,7 @@ cr_term_one_to_string (CRTerm const * a_this)
case TERM_STRING:
if (a_this->content.str) {
- content = g_strndup
+ content = (guchar *) g_strndup
(a_this->content.str->stryng->str,
a_this->content.str->stryng->len);
}
@@ -586,13 +586,13 @@ cr_term_one_to_string (CRTerm const * a_this)
case TERM_IDENT:
if (a_this->content.str) {
- content = g_strndup
+ content = (guchar *) g_strndup
(a_this->content.str->stryng->str,
a_this->content.str->stryng->len);
}
if (content) {
- g_string_append (str_buf, content);
+ g_string_append (str_buf, (const gchar *) content);
g_free (content);
content = NULL;
}
@@ -600,7 +600,7 @@ cr_term_one_to_string (CRTerm const * a_this)
case TERM_URI:
if (a_this->content.str) {
- content = g_strndup
+ content = (guchar *) g_strndup
(a_this->content.str->stryng->str,
a_this->content.str->stryng->len);
}
@@ -615,12 +615,13 @@ cr_term_one_to_string (CRTerm const * a_this)
case TERM_RGB:
if (a_this->content.rgb) {
+ guchar *tmp_str = NULL;
g_string_append_printf (str_buf, "rgb(");
- gchar *tmp_str = (gchar *)cr_rgb_to_string (a_this->content.rgb);
+ tmp_str = cr_rgb_to_string (a_this->content.rgb);
if (tmp_str) {
- g_string_append (str_buf, tmp_str);
+ g_string_append (str_buf, (const gchar *) tmp_str);
g_free (tmp_str);
tmp_str = NULL;
}
@@ -637,7 +638,7 @@ cr_term_one_to_string (CRTerm const * a_this)
case TERM_HASH:
if (a_this->content.str) {
- content = g_strndup
+ content = (guchar *) g_strndup
(a_this->content.str->stryng->str,
a_this->content.str->stryng->len);
}
@@ -658,7 +659,7 @@ cr_term_one_to_string (CRTerm const * a_this)
}
if (str_buf) {
- result = (guchar *)str_buf->str;
+ result = (guchar *) str_buf->str;
g_string_free (str_buf, FALSE);
str_buf = NULL;
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-08 19:25:56 +0000