clean up tabs and DOS-ishness

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

diff --git a/src/libcroco/cr-pseudo.c b/src/libcroco/cr-pseudo.c
index 8e036a30f523844bc37e370330b76536f0ec097a..abb4f9bd43bbc9dcb18950f2b63b744d4a67b0c6 100644 (file)
--- a/src/libcroco/cr-pseudo.c
+++ b/src/libcroco/cr-pseudo.c
@@ -35,9 +35,7 @@
 CRPseudo *
 cr_pseudo_new (void)
 {
-        CRPseudo *result = NULL;
-
-        result = g_malloc0 (sizeof (CRPseudo));
+        CRPseudo *result = (CRPseudo *)g_malloc0 (sizeof (CRPseudo));
 
         return result;
 }
@@ -46,20 +44,17 @@ guchar *
 cr_pseudo_to_string (CRPseudo * a_this)
 {
         guchar *result = NULL;
-        GString *str_buf = NULL;
 
         g_return_val_if_fail (a_this, NULL);
 
-        str_buf = g_string_new (NULL);
+        GString *str_buf = (GString *)g_string_new (NULL);
 
         if (a_this->type == IDENT_PSEUDO) {
-                guchar *name = NULL;
 
-                if (a_this->name == NULL) {
+                if (a_this->name == NULL)
                         goto error;
-                }
 
-                name = g_strndup (a_this->name->stryng->str, 
+                gchar *name = g_strndup (a_this->name->stryng->str, 
                                   a_this->name->stryng->len);
 
                 if (name) {
@@ -68,13 +63,12 @@ cr_pseudo_to_string (CRPseudo * a_this)
                         name = NULL;
                 }
         } else if (a_this->type == FUNCTION_PSEUDO) {
-                guchar *name = NULL,
-                        *arg = NULL;
+                gchar *arg = NULL;
 
                 if (a_this->name == NULL)
                         goto error;
 
-                name = g_strndup (a_this->name->stryng->str, 
+                gchar *name = g_strndup (a_this->name->stryng->str, 
                                   a_this->name->stryng->len);
 
                 if (a_this->extra) {
@@ -98,7 +92,7 @@ cr_pseudo_to_string (CRPseudo * a_this)
         }
 
         if (str_buf) {
-                result = str_buf->str;
+                result = (guchar *)str_buf->str;
                 g_string_free (str_buf, FALSE);
                 str_buf = NULL;
         }