Fix compiler warnings

diff --git a/gen.sh b/gen.sh
index 2cbbd0d57abaac086dd7928851329437345f9c95..adbf6e27d763c722c58ac897a0c6118509135636 100755 (executable)
--- a/gen.sh
+++ b/gen.sh
@@ -4,5 +4,5 @@ dir=$(dirname $(readlink -f $0))
        "--enable-gtk-doc" \
        "--libdir=$dir/src/.libs" \
        "--includedir=$dir/include" \
        "--enable-gtk-doc" \
        "--libdir=$dir/src/.libs" \
        "--includedir=$dir/include" \

-       CFLAGS="-g -Werror -Wno-unused $CFLAGS" \
+       CFLAGS="-g -Werror $CFLAGS" \

        LDFLAGS="-Wl,-z,defs"
        LDFLAGS="-Wl,-z,defs"

diff --git a/src/gis-opengl.c b/src/gis-opengl.c
index 11c489b7a27d1f368c9d12f0018a96014ae26152..ecbf47a4c140fa457de449051e88eb39696ceb00 100644 (file)
--- a/src/gis-opengl.c
+++ b/src/gis-opengl.c
@@ -548,7 +548,6 @@ GisViewer *gis_opengl_new(GisPlugins *plugins, GisPrefs *prefs)
 
 static void gis_opengl_center_position(GisViewer *_opengl, gdouble lat, gdouble lon, gdouble elev)
 {
 
 static void gis_opengl_center_position(GisViewer *_opengl, gdouble lat, gdouble lon, gdouble elev)
 {

-       GisOpenGL *opengl = GIS_OPENGL(_opengl);

        glRotatef(lon, 0, 1, 0);
        glRotatef(-lat, 1, 0, 0);
        glTranslatef(0, 0, elev2rad(elev));
        glRotatef(lon, 0, 1, 0);
        glRotatef(-lat, 1, 0, 0);
        glTranslatef(0, 0, elev2rad(elev));

diff --git a/src/gis-viewer.c b/src/gis-viewer.c
index b89c37fd45449ba7d8bab0c7e2f882b018890ab5..8679ff990104d4a79758a41c8f5491689a0e631c 100644 (file)
--- a/src/gis-viewer.c
+++ b/src/gis-viewer.c
@@ -142,7 +142,7 @@ static gboolean on_button_press(GisViewer *viewer, GdkEventButton *event, gpoint
        case 1:  viewer->drag_mode = GIS_DRAG_PAN;  break;
        case 2:  viewer->drag_mode = GIS_DRAG_ZOOM; break;
        case 3:  viewer->drag_mode = GIS_DRAG_TILT; break;
        case 1:  viewer->drag_mode = GIS_DRAG_PAN;  break;
        case 2:  viewer->drag_mode = GIS_DRAG_ZOOM; break;
        case 3:  viewer->drag_mode = GIS_DRAG_TILT; break;

-       defualt: viewer->drag_mode = GIS_DRAG_NONE; break;
+       default: viewer->drag_mode = GIS_DRAG_NONE; break;

        }
        viewer->drag_x = event->x;
        viewer->drag_y = event->y;
        }
        viewer->drag_x = event->x;
        viewer->drag_y = event->y;


@@ -585,7 +585,6 @@ static void gis_viewer_init(GisViewer *viewer)
 static void gis_viewer_finalize(GObject *gobject)
 {
        g_debug("GisViewer: finalize");
 static void gis_viewer_finalize(GObject *gobject)
 {
        g_debug("GisViewer: finalize");

-       GisViewer *viewer = GIS_VIEWER(gobject);

        G_OBJECT_CLASS(gis_viewer_parent_class)->finalize(gobject);
 }
 static void gis_viewer_class_init(GisViewerClass *klass)
        G_OBJECT_CLASS(gis_viewer_parent_class)->finalize(gobject);
 }
 static void gis_viewer_class_init(GisViewerClass *klass)

diff --git a/src/plugins/elev.c b/src/plugins/elev.c
index a8f9df1ac89264e88a49c7ee2ab9bee2357d07c4..a6589ff0b6aff8af717ea2055611a46d10abeca3 100644 (file)
--- a/src/plugins/elev.c
+++ b/src/plugins/elev.c
@@ -237,7 +237,6 @@ static gboolean _free_tile_cb(gpointer _data)
 }
 static void _free_tile(GisTile *tile, gpointer _elev)
 {
 }
 static void _free_tile(GisTile *tile, gpointer _elev)
 {

-       GisPluginElev *elev = _elev;

        g_debug("GisPluginElev: _free_tile: %p", tile->data);
        if (tile->data)
                g_idle_add_full(G_PRIORITY_LOW, _free_tile_cb, tile->data, NULL);
        g_debug("GisPluginElev: _free_tile: %p", tile->data);
        if (tile->data)
                g_idle_add_full(G_PRIORITY_LOW, _free_tile_cb, tile->data, NULL);

diff --git a/src/plugins/map.c b/src/plugins/map.c
index 5799ca05eb6c1b6709dd9279c4459f755b1c4254..d93e33633f73fe5862752ae00ccfdf0abd43f330 100644 (file)
--- a/src/plugins/map.c
+++ b/src/plugins/map.c
@@ -128,7 +128,6 @@ static gboolean _free_tile_cb(gpointer data)
 }
 static void _free_tile(GisTile *tile, gpointer _map)
 {
 }
 static void _free_tile(GisTile *tile, gpointer _map)
 {

-       GisPluginMap *map = _map;

        g_debug("GisPluginMap: _free_tile: %p", tile->data);
        if (tile->data)
                g_idle_add_full(G_PRIORITY_LOW, _free_tile_cb, tile->data, NULL);
        g_debug("GisPluginMap: _free_tile: %p", tile->data);
        if (tile->data)
                g_idle_add_full(G_PRIORITY_LOW, _free_tile_cb, tile->data, NULL);

diff --git a/src/plugins/sat.c b/src/plugins/sat.c
index 2d28da5ede3d7870dcb3a32084af80982ed8d9fb..1e61f1de2c630fb6d10e1489be3d82c71929ea39 100644 (file)
--- a/src/plugins/sat.c
+++ b/src/plugins/sat.c
@@ -118,7 +118,6 @@ static gboolean _free_tile_cb(gpointer data)
 }
 static void _free_tile(GisTile *tile, gpointer _sat)
 {
 }
 static void _free_tile(GisTile *tile, gpointer _sat)
 {

-       GisPluginSat *sat = _sat;

        g_debug("GisPluginSat: _free_tile: %p", tile->data);
        if (tile->data)
                g_idle_add_full(G_PRIORITY_LOW, _free_tile_cb, tile->data, NULL);
        g_debug("GisPluginSat: _free_tile: %p", tile->data);
        if (tile->data)
                g_idle_add_full(G_PRIORITY_LOW, _free_tile_cb, tile->data, NULL);

diff --git a/src/roam.c b/src/roam.c
index 3de5b5b7258ea938116827bf815ac2a1b5fee66e..6694026a10e320b75be2b3ce683933d215ef3784 100644 (file)
--- a/src/roam.c
+++ b/src/roam.c
@@ -84,13 +84,6 @@ RoamPoint *roam_point_new(gdouble lat, gdouble lon, gdouble elev)
        return point;
 }
 
        return point;
 }
 

-static RoamPoint *roam_point_dup(RoamPoint *point)
-{
-       RoamPoint *new = g_memdup(point, sizeof(RoamPoint));
-       new->tris = 0;
-       return new;
-}
-

 /**
  * roam_point_add_triangle:
  * @point:    the point
 /**
  * roam_point_add_triangle:
  * @point:    the point