[QA] Fix clang warning: format string is not a string literal

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

diff --git a/src/file.c b/src/file.c
index 09870af6214339f50c0d03d233beb315bee3ea64..d2692a35752db5a8631daa09733e0cfacbc28d01 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -26,7 +26,9 @@
 #endif
 #include "viking.h"
 
 #endif
 #include "viking.h"
 

+#include "jpg.h"

 #include "gpx.h"
 #include "gpx.h"

+#include "geojson.h"

 #include "babel.h"
 
 #include <string.h>
 #include "babel.h"
 
 #include <string.h>


@@ -43,6 +45,7 @@
 #include <glib/gi18n.h>
 
 #include "file.h"
 #include <glib/gi18n.h>
 
 #include "file.h"

+#include "misc/strtod.h"

 
 #define TEST_BOOLEAN(str) (! ((str)[0] == '\0' || (str)[0] == '0' || (str)[0] == 'n' || (str)[0] == 'N' || (str)[0] == 'f' || (str)[0] == 'F') )
 #define VIK_MAGIC "#VIK"
 
 #define TEST_BOOLEAN(str) (! ((str)[0] == '\0' || (str)[0] == '0' || (str)[0] == 'n' || (str)[0] == 'N' || (str)[0] == 'f' || (str)[0] == 'F') )
 #define VIK_MAGIC "#VIK"


@@ -341,7 +344,7 @@ static gboolean file_read ( VikAggregateLayer *top, FILE *f, const gchar *dirpat
           }
           else
           {
           }
           else
           {

-            stack->data = (gpointer) vik_layer_create ( type, vp, NULL, FALSE );
+            stack->data = (gpointer) vik_layer_create ( type, vp, FALSE );

             params = vik_layer_get_interface(type)->params;
             params_count = vik_layer_get_interface(type)->params_count;
           }
             params = vik_layer_get_interface(type)->params;
             params_count = vik_layer_get_interface(type)->params_count;
           }


@@ -431,13 +434,13 @@ static gboolean file_read ( VikAggregateLayer *top, FILE *f, const gchar *dirpat
         // However we'll still carry and attempt to read whatever we can
       }
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "xmpp", eq_pos ) == 0) /* "hard coded" params: global & for all layer-types */
         // However we'll still carry and attempt to read whatever we can
       }
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "xmpp", eq_pos ) == 0) /* "hard coded" params: global & for all layer-types */

-        vik_viewport_set_xmpp ( VIK_VIEWPORT(vp), strtod ( line+5, NULL ) );
+        vik_viewport_set_xmpp ( VIK_VIEWPORT(vp), strtod_i8n ( line+5, NULL ) );

       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "ympp", eq_pos ) == 0)
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "ympp", eq_pos ) == 0)

-        vik_viewport_set_ympp ( VIK_VIEWPORT(vp), strtod ( line+5, NULL ) );
+        vik_viewport_set_ympp ( VIK_VIEWPORT(vp), strtod_i8n ( line+5, NULL ) );

       else if ( stack->under == NULL && eq_pos == 3 && strncasecmp ( line, "lat", eq_pos ) == 0 )
       else if ( stack->under == NULL && eq_pos == 3 && strncasecmp ( line, "lat", eq_pos ) == 0 )

-        ll.lat = strtod ( line+4, NULL );
+        ll.lat = strtod_i8n ( line+4, NULL );

       else if ( stack->under == NULL && eq_pos == 3 && strncasecmp ( line, "lon", eq_pos ) == 0 )
       else if ( stack->under == NULL && eq_pos == 3 && strncasecmp ( line, "lon", eq_pos ) == 0 )

-        ll.lon = strtod ( line+4, NULL );
+        ll.lon = strtod_i8n ( line+4, NULL );

       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "utm" ) == 0)
         vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_UTM);
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "expedia" ) == 0)
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "utm" ) == 0)
         vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_UTM);
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "expedia" ) == 0)


@@ -498,7 +501,7 @@ static gboolean file_read ( VikAggregateLayer *top, FILE *f, const gchar *dirpat
             } else {
               switch ( params[i].type )
               {
             } else {
               switch ( params[i].type )
               {

-                case VIK_LAYER_PARAM_DOUBLE: x.d = strtod(line, NULL); break;
+                case VIK_LAYER_PARAM_DOUBLE: x.d = strtod_i8n(line, NULL); break;

                 case VIK_LAYER_PARAM_UINT: x.u = strtoul(line, NULL, 10); break;
                 case VIK_LAYER_PARAM_INT: x.i = strtol(line, NULL, 10); break;
                case VIK_LAYER_PARAM_BOOLEAN: x.b = TEST_BOOLEAN(line); break;
                 case VIK_LAYER_PARAM_UINT: x.u = strtoul(line, NULL, 10); break;
                 case VIK_LAYER_PARAM_INT: x.i = strtol(line, NULL, 10); break;
                case VIK_LAYER_PARAM_BOOLEAN: x.b = TEST_BOOLEAN(line); break;


@@ -546,7 +549,7 @@ name=this
   }
 
   if ( ll.lat != 0.0 || ll.lon != 0.0 )
   }
 
   if ( ll.lat != 0.0 || ll.lon != 0.0 )

-    vik_viewport_set_center_latlon ( VIK_VIEWPORT(vp), &ll );
+    vik_viewport_set_center_latlon ( VIK_VIEWPORT(vp), &ll, TRUE );

 
   if ( ( ! VIK_LAYER(top)->visible ) && VIK_LAYER(top)->realized )
     vik_treeview_item_set_visible ( VIK_LAYER(top)->vt, &(VIK_LAYER(top)->iter), FALSE ); 
 
   if ( ( ! VIK_LAYER(top)->visible ) && VIK_LAYER(top)->realized )
     vik_treeview_item_set_visible ( VIK_LAYER(top)->vt, &(VIK_LAYER(top)->iter), FALSE ); 


@@ -574,7 +577,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;


@@ -596,7 +599,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 );


@@ -611,7 +614,7 @@ gboolean check_file_magic_vik ( const gchar *filename )
  *
  * Returns: a newly allocated string
  */
  *
  * Returns: a newly allocated string
  */

-gchar *append_file_ext ( const gchar *filename, VikLoadType_t type )
+gchar *append_file_ext ( const gchar *filename, VikFileType_t type )

 {
   gchar *new_name = NULL;
   const gchar *ext = NULL;
 {
   gchar *new_name = NULL;
   const gchar *ext = NULL;


@@ -625,6 +628,9 @@ gchar *append_file_ext ( const gchar *filename, VikLoadType_t type )
   case FILE_TYPE_KML:
     ext = ".kml";
     break;
   case FILE_TYPE_KML:
     ext = ".kml";
     break;

+  case FILE_TYPE_GEOJSON:
+    ext = ".geojson";
+    break;

   case FILE_TYPE_GPSMAPPER:
   case FILE_TYPE_GPSPOINT:
   default:
   case FILE_TYPE_GPSMAPPER:
   case FILE_TYPE_GPSPOINT:
   default:


@@ -633,7 +639,7 @@ gchar *append_file_ext ( const gchar *filename, VikLoadType_t type )
   }
 
   /* Do */
   }
 
   /* Do */

-  if ( ext != NULL && ! check_file_ext ( filename, ext ) )
+  if ( ext != NULL && ! a_file_check_ext ( filename, ext ) )

     new_name = g_strconcat ( filename, ext, NULL );
   else
     /* Simply duplicate */
     new_name = g_strconcat ( filename, ext, NULL );
   else
     /* Simply duplicate */


@@ -654,7 +660,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;


@@ -670,17 +676,21 @@ VikLoadType_t a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar
     else
       load_answer = LOAD_TYPE_VIK_FAILURE_NON_FATAL;
   }
     else
       load_answer = LOAD_TYPE_VIK_FAILURE_NON_FATAL;
   }

+  else if ( a_jpg_magic_check ( filename ) ) {
+    if ( ! a_jpg_load_file ( top, filename, vp ) )
+      load_answer = LOAD_TYPE_UNSUPPORTED_FAILURE;
+  }

   else
   {
        // For all other file types which consist of tracks, routes and/or waypoints,
        //  must be loaded into a new TrackWaypoint layer (hence it be created)
     gboolean success = TRUE; // Detect load failures - mainly to remove the layer created as it's not required
 
   else
   {
        // For all other file types which consist of tracks, routes and/or waypoints,
        //  must be loaded into a new TrackWaypoint layer (hence it be created)
     gboolean success = TRUE; // Detect load failures - mainly to remove the layer created as it's not required
 

-    VikLayer *vtl = vik_layer_create ( VIK_LAYER_TRW, vp, NULL, FALSE );
+    VikLayer *vtl = vik_layer_create ( VIK_LAYER_TRW, vp, FALSE );

     vik_layer_rename ( vtl, a_file_basename ( filename ) );
 
     // In fact both kml & gpx files start the same as they are in xml
     vik_layer_rename ( vtl, a_file_basename ( filename ) );
 
     // In fact both kml & gpx files start the same as they are in xml

-    if ( check_file_ext ( filename, ".kml" ) && check_magic ( f, GPX_MAGIC ) ) {
+    if ( a_file_check_ext ( filename, ".kml" ) && check_magic ( f, GPX_MAGIC ) ) {

       // Implicit Conversion
       if ( ! ( success = a_babel_convert_from ( VIK_TRW_LAYER(vtl), "-i kml", filename, NULL, NULL, NULL ) ) ) {
         load_answer = LOAD_TYPE_GPSBABEL_FAILURE;
       // Implicit Conversion
       if ( ! ( success = a_babel_convert_from ( VIK_TRW_LAYER(vtl), "-i kml", filename, NULL, NULL, NULL ) ) ) {
         load_answer = LOAD_TYPE_GPSBABEL_FAILURE;


@@ -688,7 +698,7 @@ VikLoadType_t a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar
     }
     // NB use a extension check first, as a GPX file header may have a Byte Order Mark (BOM) in it
     //    - which currently confuses our check_magic function
     }
     // NB use a extension check first, as a GPX file header may have a Byte Order Mark (BOM) in it
     //    - which currently confuses our check_magic function

-    else if ( check_file_ext ( filename, ".gpx" ) || check_magic ( f, GPX_MAGIC ) ) {
+    else if ( a_file_check_ext ( filename, ".gpx" ) || check_magic ( f, GPX_MAGIC ) ) {

       if ( ! ( success = a_gpx_read_file ( VIK_TRW_LAYER(vtl), f ) ) ) {
         load_answer = LOAD_TYPE_GPX_FAILURE;
       }
       if ( ! ( success = a_gpx_read_file ( VIK_TRW_LAYER(vtl), f ) ) ) {
         load_answer = LOAD_TYPE_GPX_FAILURE;
       }


@@ -757,21 +767,10 @@ 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: 
 /* example: 

-     gboolean is_gpx = check_file_ext ( "a/b/c.gpx", ".gpx" );
+     gboolean is_gpx = a_file_check_ext ( "a/b/c.gpx", ".gpx" );

 */
 */

-gboolean check_file_ext ( const gchar *filename, const gchar *fileext )
+gboolean a_file_check_ext ( const gchar *filename, const gchar *fileext )

 {
   g_return_val_if_fail ( filename != NULL, FALSE );
   g_return_val_if_fail ( fileext && fileext[0]=='.', FALSE );
 {
   g_return_val_if_fail ( filename != NULL, FALSE );
   g_return_val_if_fail ( fileext && fileext[0]=='.', FALSE );


@@ -803,6 +802,8 @@ gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, VikFileType_t
   FILE *f = g_fopen ( filename, "w" );
   if ( f )
   {
   FILE *f = g_fopen ( filename, "w" );
   if ( f )
   {

+    gboolean result = TRUE;
+

     if ( trk ) {
       switch ( file_type ) {
         case FILE_TYPE_GPX:
     if ( trk ) {
       switch ( file_type ) {
         case FILE_TYPE_GPX:


@@ -824,6 +825,9 @@ gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, VikFileType_t
         case FILE_TYPE_GPSPOINT:
           a_gpspoint_write_file ( vtl, f );
           break;
         case FILE_TYPE_GPSPOINT:
           a_gpspoint_write_file ( vtl, f );
           break;

+        case FILE_TYPE_GEOJSON:
+          result = a_geojson_write_file ( vtl, f );
+          break;

         case FILE_TYPE_KML:
          fclose ( f );
          f = NULL;
         case FILE_TYPE_KML:
          fclose ( f );
          f = NULL;


@@ -846,7 +850,7 @@ gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, VikFileType_t
     }
     fclose ( f );
     f = NULL;
     }
     fclose ( f );
     f = NULL;

-    return TRUE;
+    return result;

   }
   return FALSE;
 }
   }
   return FALSE;
 }