[r-cran-maps] 17/64: Import Upstream version 2.0-37

[Andreas Tille]

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

tille pushed a commit to branch master
in repository r-cran-maps.

commit 2be941f7460570a04b9e2d9649e4e6fe911d85f3
Author: Andreas Tille <tille at debian.org>
Date:   Thu Sep 7 09:25:52 2017 +0200

    Import Upstream version 2.0-37
---
 DESCRIPTION |  6 +++---
 src/Gmake.c | 18 +++++++++---------
 src/Lmake.c | 10 +++++-----
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 1c4b996..7fa7954 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: maps
 Title: Draw Geographical Maps
-Version: 2.0-36
-Date: 2007-04-26
+Version: 2.0-37
+Date: 2007-06-14
 Author: Original S code by Richard A. Becker and Allan R. Wilks.
 	R version by Ray Brownrigg <Ray.Brownrigg at mcs.vuw.ac.nz>
         Enhancements by Thomas P Minka <surname at stat.cmu.edu>
@@ -11,4 +11,4 @@ Depends: R (>= 1.7.0)
 Suggests: mapproj
 License: GPL2
 Maintainer: Ray Brownrigg <Ray.Brownrigg at mcs.vuw.ac.nz>
-Packaged: Thu Apr 26 10:10:53 2007; ray
+Packaged: Thu Jun 14 14:21:13 2007; ray
diff --git a/src/Gmake.c b/src/Gmake.c
index b819545..5cbea5f 100644
--- a/src/Gmake.c
+++ b/src/Gmake.c
@@ -108,9 +108,9 @@ Polyline r;
 
 	seek = sizeof(int) + sizeof(Polyline) + (r-1)*sizeof(struct line_h);
 	if(Seek(Lin, seek) == -1)
-		fatal("Cannot seek to header in %s", Linefile);
+		fatal("Cannot seek to header in %s", (int)Linefile);
 	if(Read(Lin, &lh, 1) != 1)
-		fatal("Cannot read header in %s", Linefile);
+		fatal("Cannot read header in %s", (int)Linefile);
 	return(&lh);
 }
 
@@ -207,23 +207,23 @@ char *av[];
 
 	Me = av[0];
 	if(ac < 5)
-		fatal(Usage, Me);
+		fatal(Usage, (int)Me);
 	ascii = *av[1] == 'a';
 	if(ac != (ascii ? 5 : 6))
-		fatal(Usage, Me);
+		fatal(Usage, (int)Me);
 	Infile = av[2];
 	if((in = fopen(av[2], "rb")) == NULL)
-		fatal("Cannot open %s for reading", av[2]);
+		fatal("Cannot open %s for reading", (int)av[2]);
 	if((in2 = fopen(av[3], "rb")) == NULL)
-                fatal("Cannot open %s for reading", av[3]);
+                fatal("Cannot open %s for reading", (int)av[3]);
 	if(fscanf(in2, "%d%d", &np, &maxl) != 2)
-		fatal("Cannot read stats data file %s", av[3]);
+		fatal("Cannot read stats data file %s", (int)av[3]);
 	n = np;	/* won't read directly */
 	if((out = fopen(av[4], "wb")) == NULL)
-		fatal("Cannot open %s for writing", av[4]);
+		fatal("Cannot open %s for writing", (int)av[4]);
 	Linefile = av[5];
 	if(!ascii && (Lin = fopen(av[5], "rb")) == NULL)
-		fatal("Cannot open %s for reading", av[5]);
+		fatal("Cannot open %s for reading", (int)av[5]);
 	ascii ? to_ascii(in, out) : to_binary(in, out);
 	exit(0);
 }
diff --git a/src/Lmake.c b/src/Lmake.c
index 57e9094..350497a 100644
--- a/src/Lmake.c
+++ b/src/Lmake.c
@@ -218,19 +218,19 @@ char *av[];
 
 	Me = av[0];
 	if(ac != 7)
-		fatal(Usage, Me);
+		fatal(Usage, (int)Me);
 	Precision = atoi(av[1]);
 	Coordtype = av[2][0] == 's' ? SPHERE : PLANE;
 	Infile = av[4];
 	if((in = fopen(av[4], "rb")) == NULL)
-                fatal("Cannot open %s for reading", av[4]);
+                fatal("Cannot open %s for reading", (int)av[4]);
 	if((in2 = fopen(av[5], "rb")) == NULL)
-                fatal("Cannot open %s for reading", av[5]);
+                fatal("Cannot open %s for reading", (int)av[5]);
 	if(fscanf(in2, "%d%d", &nl, &maxp) != 2)
-		fatal("Cannot read stats data file %s", av[3]);
+		fatal("Cannot read stats data file %s", (int)av[3]);
 	n = nl;
         if((out = fopen(av[6], "wb")) == NULL)
-                fatal("Cannot open %s for writing", av[6]);
+                fatal("Cannot open %s for writing", (int)av[6]);
         av[3][0] == 'a' ? (void) to_ascii(in, out) : (void) to_binary(in, out);
 	exit(0);
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-maps.git