X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/5bed0ef628e52d0927340545c10c0cebe6fb1e1e..12b68116138027b0004412a3a058694a5102885c:/src/file.c?ds=sidebyside

diff --git a/src/file.c b/src/file.c
index 239c0b3a..bae3fa76 100644
--- a/src/file.c
+++ b/src/file.c
@@ -575,7 +575,7 @@ if "[LayerData]"
 
 /* ---------------------------------------------------- */
 
-static FILE *xfopen ( const char *fn, const char *mode )
+static FILE *xfopen ( const char *fn )
 {
   if ( strcmp(fn,"-") == 0 )
     return stdin;
@@ -597,7 +597,7 @@ static void xfclose ( FILE *f )
 gboolean check_file_magic_vik ( const gchar *filename )
 {
   gboolean result = FALSE;
-  FILE *ff = xfopen ( filename, "r" );
+  FILE *ff = xfopen ( filename );
   if ( ff ) {
     result = check_magic ( ff, VIK_MAGIC );
     xfclose ( ff );
@@ -655,7 +655,7 @@ VikLoadType_t a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar
     filename = filename + 7;
     g_debug ( "Loading file %s from URI %s", filename, filename_or_uri );
   }
-  FILE *f = xfopen ( filename, "r" );
+  FILE *f = xfopen ( filename );
 
   if ( ! f )
     return LOAD_TYPE_READ_FAILURE;
@@ -762,17 +762,6 @@ gboolean a_file_save ( VikAggregateLayer *top, gpointer vp, const gchar *filenam
 }
 
 
-const gchar *a_file_basename ( const gchar *filename )
-{
-  const gchar *t = filename + strlen(filename) - 1;
-  while ( --t > filename )
-    if ( *(t-1) == G_DIR_SEPARATOR )
-      break;
-  if ( t >= filename )
-    return t;
-  return filename;
-}
-
 /* example: 
      gboolean is_gpx = a_file_check_ext ( "a/b/c.gpx", ".gpx" );
 */