clean up tabs and DOS-ishness

[inkscape.git] / src / libcroco / cr-parsing-location.c

diff --git a/src/libcroco/cr-parsing-location.c b/src/libcroco/cr-parsing-location.c
index 81b05f7c304cf3c72ad48fe61f1e199625b325b3..38a75a6e6244ff3a42cd03ebd82a846997b8c5ab 100644 (file)
--- a/src/libcroco/cr-parsing-location.c
+++ b/src/libcroco/cr-parsing-location.c
@@ -38,9 +38,8 @@
 CRParsingLocation * 
 cr_parsing_location_new (void)
 {
-       CRParsingLocation * result = NULL ;
-
-       result = g_try_malloc (sizeof (CRParsingLocation)) ;
+       CRParsingLocation *result = 
+           (CRParsingLocation *)g_try_malloc (sizeof (CRParsingLocation)) ;
        if (!result) {
                cr_utils_trace_info ("Out of memory error") ;
                return NULL ;
@@ -91,15 +90,15 @@ gchar *
 cr_parsing_location_to_string (CRParsingLocation *a_this,
                               enum CRParsingLocationSerialisationMask a_mask)
 {
-       GString *result = NULL ;
        gchar *str = NULL ;
 
        g_return_val_if_fail (a_this, NULL) ;
 
        if (!a_mask) {
-               a_mask = DUMP_LINE | DUMP_COLUMN | DUMP_BYTE_OFFSET ;
+               a_mask = (enum CRParsingLocationSerialisationMask)
+                   ((int)DUMP_LINE | (int)DUMP_COLUMN | (int)DUMP_BYTE_OFFSET) ;
        }
-       result =g_string_new (NULL) ;
+       GString *result = (GString *)g_string_new (NULL) ;
        if (!result)
                return NULL ;
        if (a_mask & DUMP_LINE) {