[saga] 05/05: Fix gcc errors (backported from upstream)

[Johan Van de Wauw]

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

johanvdw-guest pushed a commit to branch master
in repository saga.

commit 7170c6517c267f3131f8b919589c79012ff7ea84
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Fri Jun 13 01:16:32 2014 +0200

    Fix gcc errors (backported from upstream)
---
 .../0004-Fix-gcc-errors-from-upstream.patch        | 52 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 53 insertions(+)

diff --git a/debian/patches/0004-Fix-gcc-errors-from-upstream.patch b/debian/patches/0004-Fix-gcc-errors-from-upstream.patch
new file mode 100644
index 0000000..d6647c6
--- /dev/null
+++ b/debian/patches/0004-Fix-gcc-errors-from-upstream.patch
@@ -0,0 +1,52 @@
+From: Johan Van de Wauw <johan.vandewauw at gmail.com>
+Date: Fri, 13 Jun 2014 01:04:37 +0200
+Subject: Fix gcc errors - from upstream
+
+>From upstream:
+errfunc.c: fix bug, refers to bug #191 Missing format strings
+2014-05-29 12:13:13
+by reklov_w
+---
+ src/modules/grid/grid_filter/geodesic_morph_rec/errfunc.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/modules/grid/grid_filter/geodesic_morph_rec/errfunc.c b/src/modules/grid/grid_filter/geodesic_morph_rec/errfunc.c
+index 959b37f..d229221 100644
+--- a/src/modules/grid/grid_filter/geodesic_morph_rec/errfunc.c
++++ b/src/modules/grid/grid_filter/geodesic_morph_rec/errfunc.c
+@@ -225,7 +225,7 @@ void fehler (int zeile,
+       cp4 = cp2;
+    }
+ 
+-   fprintf (protfile, cp1);
++   fprintf (protfile, "%s", cp1);
+ 
+    if (fil -> art == 'E')
+    {
+@@ -415,7 +415,7 @@ void error_message (int zeile,
+       cp4 = cp2;
+    }
+ 
+-   sprintf (fmessage + sl_all, cp1);
++   sprintf (fmessage + sl_all, "%s", cp1);
+    sl_all = strlen (fmessage);
+    
+    sl_alt = strlen (*error_list);
+@@ -577,7 +577,7 @@ void fehler2 (int zeile,
+ 
+    va_end (ap);
+ 
+-   fprintf (protfile, cp1);
++   fprintf (protfile, "%s", cp1);
+ 
+    if (fil -> art == 'E')
+    {
+@@ -756,7 +756,7 @@ void fehler3 (int zeile,
+ 
+    va_end (ap);
+ 
+-   sprintf (fmessage + sl_all, cp1);
++   sprintf (fmessage + sl_all, "%s", cp1);
+    sl_all = strlen (fmessage);
+    
+    sl_alt = strlen (*error_list);
diff --git a/debian/patches/series b/debian/patches/series
index 2f9e915..11eb524 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Use-qhull-instead-of-triangle.patch
 0002-Remove-reference-to-libfire.patch
 0003-Remove-references-to-internal-grib2-and-libfire.patch
+0004-Fix-gcc-errors-from-upstream.patch

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