Remove dependencies to gob2

[andy/viking.git] / src / file.c

diff --git a/src/file.c b/src/file.c
index d7cc89d4c0802b5dc78379df0dcb492bcc4ecb4e..3c30c30f218c7a794923bd6e0f9edb2f3b7e36fa 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -28,8 +28,13 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #include <glib.h>
 #include <glib/gstdio.h>
+#include <glib/gi18n.h>
 
 /* Relax some dependencies */
 #if ! GLIB_CHECK_VERSION(2,12,0)
@@ -168,6 +173,7 @@ static void file_write ( VikAggregateLayer *top, FILE *f, gpointer vp )
   Stack *stack = NULL;
   VikLayer *current_layer;
   struct LatLon ll;
+  VikViewportDrawMode mode;
   gchar *modestring;
 
   push(&stack);
@@ -177,12 +183,13 @@ static void file_write ( VikAggregateLayer *top, FILE *f, gpointer vp )
   /* crazhy CRAZHY */
   vik_coord_to_latlon ( vik_viewport_get_center ( VIK_VIEWPORT(vp) ), &ll );
 
-  switch ( vik_viewport_get_drawmode ( VIK_VIEWPORT(vp) ) ) {
+  mode = vik_viewport_get_drawmode ( VIK_VIEWPORT(vp) );
+  switch ( mode ) {
     case VIK_VIEWPORT_DRAWMODE_UTM: modestring = "utm"; break;
     case VIK_VIEWPORT_DRAWMODE_EXPEDIA: modestring = "expedia"; break;
-    case VIK_VIEWPORT_DRAWMODE_GOOGLE: modestring = "google"; break;
-    case VIK_VIEWPORT_DRAWMODE_KH: modestring = "kh"; break;
-    default: modestring = "mercator";
+    case VIK_VIEWPORT_DRAWMODE_MERCATOR: modestring = "mercator"; break;
+    default:
+      g_critical("Houston, we've had a problem. mode=%d", mode);
   }
 
   fprintf ( f, "#VIKING GPS Data file " VIKING_URL "\n\nxmpp=%f\nympp=%f\nlat=%f\nlon=%f\nmode=%s\ncolor=%s\ndrawscale=%s\ndrawcentermark=%s",
@@ -316,7 +323,7 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp )
           push(&stack);
           if ( type == -1 )
           {
-            g_warning ( "Line %ld: Unknown type %s\n", line_num, line+6 );
+            g_warning ( "Line %ld: Unknown type %s", line_num, line+6 );
             stack->data = NULL;
           }
           else if (parent_type == VIK_LAYER_GPS)
@@ -415,9 +422,13 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp )
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "expedia" ) == 0)
         vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_EXPEDIA );
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "google" ) == 0)
-        vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_GOOGLE );
+      {
+        g_warning ( _("Draw mode '%s' no more supported"), "google" );
+      }
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "kh" ) == 0)
-        vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_KH );
+      {
+        g_warning ( _("Draw mode '%s' no more supported"), "kh" );
+      }
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "mercator" ) == 0)
         vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_MERCATOR );
       else if ( stack->under == NULL && eq_pos == 5 && strncasecmp ( line, "color", eq_pos ) == 0 )
@@ -449,8 +460,9 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp )
             VikLayerParamData x;
             line += eq_pos+1;
             if ( params[i].type == VIK_LAYER_PARAM_STRING_LIST ) {
-              GList *l = g_list_append ( g_hash_table_lookup ( string_lists, (gpointer) ((gint) i) ), g_strdup(line) );
-              g_hash_table_replace ( string_lists, (gpointer) ((gint)i), l );
+              GList *l = g_list_append ( g_hash_table_lookup ( string_lists, GINT_TO_POINTER ((gint) i) ), 
+                                        g_strdup(line) );
+              g_hash_table_replace ( string_lists, GINT_TO_POINTER ((gint)i), l );
               /* add the value to a list, possibly making a new list.
                * this will be passed to the layer when we read an ~EndLayer */
             } else {
@@ -527,13 +539,15 @@ static FILE *xfopen ( const char *fn, const char *mode )
   if ( strcmp(fn,"-") == 0 )
     return stdin;
   else
-    return fopen(fn, "r");
+    return g_fopen(fn, "r");
 }
 
 static void xfclose ( FILE *f )
 {
-  if ( f != stdin && f != stdout )
+  if ( f != stdin && f != stdout ) {
     fclose ( f );
+    f = NULL;
+  }
 }
 
 /* 0 on failure, 1 on success (vik file) 2 on success (other file) */
@@ -577,7 +591,7 @@ gshort a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filen
 
 gboolean a_file_save ( VikAggregateLayer *top, gpointer vp, const gchar *filename )
 {
-  FILE *f = fopen(filename, "w");
+  FILE *f = g_fopen(filename, "w");
 
   if ( ! f )
     return FALSE;
@@ -585,6 +599,7 @@ gboolean a_file_save ( VikAggregateLayer *top, gpointer vp, const gchar *filenam
   file_write ( top, f, vp );
 
   fclose(f);
+  f = NULL;
 
   return TRUE;
 }
@@ -603,7 +618,7 @@ const gchar *a_file_basename ( const gchar *filename )
 
 gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, gshort file_type )
 {
-  FILE *f = fopen ( filename, "w" );
+  FILE *f = g_fopen ( filename, "w" );
   if ( f )
   {
     if ( file_type == FILE_TYPE_GPSMAPPER )
@@ -613,6 +628,7 @@ gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, gshort file_ty
     else
       a_gpspoint_write_file ( vtl, f );
     fclose ( f );
+    f = NULL;
     return TRUE;
   }
   return FALSE;
@@ -626,22 +642,22 @@ const gchar *a_get_viking_dir()
 
   if (!viking_dir) {
     const gchar *home = g_getenv("HOME");
-    if (!home || access(home, W_OK))
+    if (!home || g_access(home, W_OK))
       home = g_get_home_dir ();
 #ifdef HAVE_MKDTEMP
-    if (!home || access(home, W_OK))
+    if (!home || g_access(home, W_OK))
     {
       static gchar temp[] = {"/tmp/vikXXXXXX"};
       home = mkdtemp(temp);
     }
 #endif
-    if (!home || access(home, W_OK))
+    if (!home || g_access(home, W_OK))
       /* Fatal error */
       g_critical("Unable to find a base directory");
 
     /* Build the name of the directory */
     viking_dir = g_build_filename(home, ".viking", NULL);
-    if (access(viking_dir, F_OK))
+    if (g_file_test(viking_dir, G_FILE_TEST_EXISTS) == FALSE)
       g_mkdir(viking_dir, 0755);
   }