[osm-gps-map] 27/153: 04-tidy_code.patch added, fixing some minor issues causing compiler warnings

[Ross Gammon]

This is an automated email from the git hooks/post-receive script.

ross-guest pushed a commit to branch master
in repository osm-gps-map.

commit a86f1f32f9d16e5f050dbfec306d79e2271e23d3
Author: David Paleino <dapal at debian.org>
Date:   Sun Jan 17 22:13:09 2010 +0100

    04-tidy_code.patch added, fixing some minor issues causing compiler warnings
---
 debian/changelog                  |  4 ++-
 debian/patches/04-tidy_code.patch | 57 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 201af3d..9b6e2bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ osm-gps-map (0.4-2) UNRELEASED; urgency=low
     - 01-fix_shared_library_linking.patch added, adds libraries to the linker
     - 03-add_missing_include.patch, glib/gstdio.h was missing
       (Closes: #564907)
+    - 04-tidy_code.patch added, fixing some minor issues causing
+      compiler warnings
 
- -- David Paleino <dapal at debian.org>  Sun, 17 Jan 2010 22:10:38 +0100
+ -- David Paleino <dapal at debian.org>  Sun, 17 Jan 2010 22:12:46 +0100
 
 osm-gps-map (0.4-1) unstable; urgency=low
 
diff --git a/debian/patches/04-tidy_code.patch b/debian/patches/04-tidy_code.patch
new file mode 100644
index 0000000..d78ece6
--- /dev/null
+++ b/debian/patches/04-tidy_code.patch
@@ -0,0 +1,57 @@
+From: David Paleino <dapal at debian.org>
+Subject: fix minor issues in the code, causing some compiler warnings
+Forwarded: no
+
+---
+ src/osm-gps-map.c |   11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+--- osm-gps-map.orig/src/osm-gps-map.c
++++ osm-gps-map/src/osm-gps-map.c
+@@ -350,7 +350,7 @@ replace_map_uri(OsmGpsMap *map, const gc
+     url = g_strdup(uri);
+     while (i < URI_FLAG_END)
+     {
+-        char *s;
++        char *s = NULL;
+         char *old;
+ 
+         old = url;
+@@ -402,9 +402,6 @@ replace_map_uri(OsmGpsMap *map, const gc
+                 url = replace_string(url, URI_MARKER_R, s);
+                 //g_debug("FOUND " URI_MARKER_R);
+                 break;
+-            default:
+-                s = NULL;
+-                break;
+         }
+ 
+         if (s) {
+@@ -588,7 +585,9 @@ osm_gps_map_draw_gps_point (OsmGpsMap *m
+         int x, y;
+         int r = priv->ui_gps_point_inner_radius;
+         int r2 = priv->ui_gps_point_outer_radius;
++#ifndef USE_CAIRO
+         int lw = priv->ui_gps_track_width;
++#endif
+         int mr = MAX(r,r2);
+ 
+         map_x0 = priv->map_x - EXTRA_BORDER;
+@@ -1267,7 +1266,7 @@ osm_gps_map_constructor (GType gtype, gu
+     GObject *object;
+     OsmGpsMapPrivate *priv;
+     OsmGpsMap *map;
+-    const char *uri, *name;
++    const char *uri;
+ 
+     //Always chain up to the parent constructor
+     object = G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);
+@@ -2194,7 +2193,7 @@ int 
+ osm_gps_map_set_zoom (OsmGpsMap *map, int zoom)
+ {
+     int zoom_old;
+-    double factor;
++    double factor = 1.0;
+     int width_center, height_center;
+     OsmGpsMapPrivate *priv;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e72a04a..aeb781a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-fix_shared_library_linking.patch
 02-fix_python_library_linking.patch
 03-add_missing_include.patch
+04-tidy_code.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm-gps-map.git