clean up tabs and DOS-ishness

[inkscape.git] / src / libcroco / cr-selector.c

diff --git a/src/libcroco/cr-selector.c b/src/libcroco/cr-selector.c
index 5f7316a005b436b4c0f5c7e79ddbd04c1d242940..d85b3effc3371df755dfcb61f1e4879ef32bd2b7 100644 (file)
--- a/src/libcroco/cr-selector.c
+++ b/src/libcroco/cr-selector.c
@@ -34,9 +34,7 @@
 CRSelector *
 cr_selector_new (CRSimpleSel * a_simple_sel)
 {
-        CRSelector *result = NULL;
-
-        result = g_try_malloc (sizeof (CRSelector));
+        CRSelector *result = (CRSelector *)g_try_malloc (sizeof (CRSelector));
         if (!result) {
                 cr_utils_trace_info ("Out of memory");
                 return NULL;
@@ -53,7 +51,8 @@ cr_selector_parse_from_buf (const guchar * a_char_buf, enum CREncoding a_enc)
 
         g_return_val_if_fail (a_char_buf, NULL);
 
-        parser = cr_parser_new_from_buf ((guchar*)a_char_buf, strlen (a_char_buf),
+        parser = cr_parser_new_from_buf ((guchar*)a_char_buf,
+                                                strlen ((char *)a_char_buf),
                                          a_enc, FALSE);
         g_return_val_if_fail (parser, NULL);
 
@@ -125,9 +124,8 @@ guchar *
 cr_selector_to_string (CRSelector * a_this)
 {
         guchar *result = NULL;
-        GString *str_buf = NULL;
 
-        str_buf = g_string_new (NULL);
+        GString *str_buf = (GString *)g_string_new (NULL);
         g_return_val_if_fail (str_buf, NULL);
 
         if (a_this) {
@@ -145,7 +143,7 @@ cr_selector_to_string (CRSelector * a_this)
                                                 g_string_append (str_buf, 
                                                                 ", ");
 
-                                        g_string_append (str_buf, tmp_str);
+                                        g_string_append (str_buf, (gchar *)tmp_str);
 
                                         g_free (tmp_str);
                                         tmp_str = NULL;
@@ -155,7 +153,7 @@ cr_selector_to_string (CRSelector * a_this)
         }
 
         if (str_buf) {
-                result = str_buf->str;
+                result = (guchar *)str_buf->str;
                 g_string_free (str_buf, FALSE);
                 str_buf = NULL;
         }