Remove unnecessary subdomain in some OSM tileserver hostnames.

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

diff --git a/src/file.c b/src/file.c
index 239c0b3a206b82db8632fa3a6562446105a5755f..bae3fa761585d62c5e7d3f03d3d5c47f1764537d 100644 (file)
--- 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;
 {
   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;
 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 );
   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 );
   }
     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;
 
   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" );
 */
 /* example: 
      gboolean is_gpx = a_file_check_ext ( "a/b/c.gpx", ".gpx" );
 */