diff --git a/.cvsignore b/.cvsignore
index e4f7f8c..f6e8ae4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-wcstools-3.6.8.tar.gz
+wcstools-3.7.0.tar.gz
diff --git a/sources b/sources
index 650cea6..808ea30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c48a173124360facf6b399da8d1f7422  wcstools-3.6.8.tar.gz
+bda2748ab4a60e196e3621cc7fa47eda  wcstools-3.7.0.tar.gz
diff --git a/wcstools.spec b/wcstools.spec
index 9818296..4bac64f 100644
--- a/wcstools.spec
+++ b/wcstools.spec
@@ -1,6 +1,6 @@
 Name: wcstools
-Version: 3.6.8
-Release: 2%{?dist}.1
+Version: 3.7.0
+Release: 1%{?dist}
 Summary: Software utilities to display and manipulate the WCS of a FITS image
 
 Group: Applications/Engineering
@@ -84,6 +84,8 @@ This are the files needed to develop an application using libwcs.
 
 
 %changelog
+* Wed Sep 05 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.7.0-1
+- New upstream source 3.7.0
 * Mon Aug 27 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2.1
 - Rebuild for Fedora 8 to get the build-id
 * Tue Mar 20 2007 Sergio Pascual <spr@astrax.fis.ucm.es> 3.6.8-2
diff --git a/wcstools3-codewarn.patch b/wcstools3-codewarn.patch
index a31fc5e..1d00f14 100644
--- a/wcstools3-codewarn.patch
+++ b/wcstools3-codewarn.patch
@@ -1,41 +1,6 @@
-+++ wcstools-3.6.6/getdate.c	2006-10-10 12:07:22.000000000 +0200
---- wcstools-3.6.6.orig/getdate.c	2006-10-10 12:06:11.000000000 +0200
-@@ -413,7 +413,7 @@
-     char *fitsdate, *newfdate, *stdate;
-     char temp[64];
-     char fyear[16];
--    char ts0[8];
-+    char ts0[9];
-     char *tchar;
-     int its, its1;
-     time_t lts;
-diff -ur wcstools-3.6.6.orig/libwcs/binread.c wcstools-3.6.6/libwcs/binread.c
---- wcstools-3.6.6.orig/libwcs/binread.c	2006-10-10 12:10:47.000000000 +0200
-+++ wcstools-3.6.6/libwcs/binread.c	2006-10-10 12:11:22.000000000 +0200
-@@ -1358,7 +1358,7 @@
- 	for (i = 0; i < nmag; i++) {
- 	    moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2);
- 	    if (sc->byteswapped)
--		binswap2 (&st->mag[i], 2);
-+		binswap2 ((char*)&st->mag[i], 2);
- 	    st->xmag[i] = 0.01 * (double) st->mag[i];
- 	    }
- 	}
-diff -ur wcstools-3.6.6.orig/libwcs/catutil.c wcstools-3.6.6/libwcs/catutil.c
---- wcstools-3.6.6.orig/libwcs/catutil.c	2006-10-10 12:10:47.000000000 +0200
-+++ wcstools-3.6.6/libwcs/catutil.c	2006-10-10 12:12:08.000000000 +0200
-@@ -722,7 +722,7 @@
- 	    lname = 0;
- 	else
- 	    lname = strlen (refcatname);
--	catname = (char *)calloc (lname + 16, 1);
-+	catname = (char *)calloc (lname + 37, sizeof(char));
- 	if (lname > 0)
- 	    sprintf (catname, "%s sources", refcatname);
- 	else
-diff -ur wcstools-3.6.8/bincat.c wcstools-3.6.8.new/bincat.c
---- wcstools-3.6.8/bincat.c	2007-03-13 16:05:40.000000000 +0100
-+++ wcstools-3.6.8.new/bincat.c	2007-03-19 18:14:16.000000000 +0100
+diff -ur wcstools-3.7.0/bincat.c wcstools-3.7.0.new/bincat.c
+--- wcstools-3.7.0/bincat.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/bincat.c	2007-09-07 20:58:35.000000000 +0200
 @@ -90,7 +90,7 @@
      char *lastchar;
      char filename[128];
@@ -45,9 +10,21 @@ diff -ur wcstools-3.6.8/bincat.c wcstools-3.6.8.new/bincat.c
      char rastr[32], decstr[32];
      double x, y;
      char cs1;
-diff -ur wcstools-3.6.8/crlf.c wcstools-3.6.8.new/crlf.c
---- wcstools-3.6.8/crlf.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/crlf.c	2007-03-19 18:25:29.000000000 +0100
+diff -ur wcstools-3.7.0/cphead.c wcstools-3.7.0.new/cphead.c
+--- wcstools-3.7.0/cphead.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/cphead.c	2007-09-07 21:27:59.000000000 +0200
+@@ -357,7 +357,7 @@
+     double dval;
+     int ival, nch;
+     int iraffile;
+-    int ndec, nbheadout, nbheadin, nbheader;
++    int ndec, nbheadout = 0, nbheadin, nbheader;
+     char newname[128];
+     char string[80];
+     char *kw, *kwe, *filepath, *fname, *ext, *imext, *imext1;
+diff -ur wcstools-3.7.0/crlf.c wcstools-3.7.0.new/crlf.c
+--- wcstools-3.7.0/crlf.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/crlf.c	2007-09-07 20:59:04.000000000 +0200
 @@ -99,7 +99,7 @@
  		if (buffer[i] == (char) 13)
  		    buffer[i] = (char) 10;
@@ -57,9 +34,30 @@ diff -ur wcstools-3.6.8/crlf.c wcstools-3.6.8.new/crlf.c
  	    }
  	}
     return;
-diff -ur wcstools-3.6.8/delwcs.c wcstools-3.6.8.new/delwcs.c
---- wcstools-3.6.8/delwcs.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/delwcs.c	2007-03-19 18:07:46.000000000 +0100
+diff -ur wcstools-3.7.0/delhead.c wcstools-3.7.0.new/delhead.c
+--- wcstools-3.7.0/delhead.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/delhead.c	2007-09-07 21:51:50.000000000 +0200
+@@ -551,7 +551,7 @@
+ char *header;	/* FITS header */
+ int verbose;	/* If true, print deletion confirmations */
+ {
+-    char *hplace, *hcom, *v, *v1, *v2, *ve;
++    char *hplace, *hcom, *v, *v2, *ve;
+     int i, killcom, nline;
+     int nkill = 0;
+ 
+@@ -585,7 +585,7 @@
+ 
+ 	    /* Fill line with blanks */
+ 	    else {
+-		for (i = 0; i++; i < 80)
++		for (i = 0; i < 80; i++)
+ 		    hcom[i] = ' ';
+ 		hplace = hplace + 80;
+ 		}
+diff -ur wcstools-3.7.0/delwcs.c wcstools-3.7.0.new/delwcs.c
+--- wcstools-3.7.0/delwcs.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/delwcs.c	2007-09-07 20:59:28.000000000 +0200
 @@ -114,7 +114,7 @@
  
  {
@@ -69,9 +67,9 @@ diff -ur wcstools-3.6.8/delwcs.c wcstools-3.6.8.new/delwcs.c
      int lhead;		/* Maximum number of bytes in FITS header */
      int nbhead;		/* Actual number of bytes in FITS header */
      int iraffile;	/* 1 if IRAF image */
-diff -ur wcstools-3.6.8/edhead.c wcstools-3.6.8.new/edhead.c
---- wcstools-3.6.8/edhead.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/edhead.c	2007-03-19 18:23:53.000000000 +0100
+diff -ur wcstools-3.7.0/edhead.c wcstools-3.7.0.new/edhead.c
+--- wcstools-3.7.0/edhead.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/edhead.c	2007-09-07 20:59:48.000000000 +0200
 @@ -210,8 +210,8 @@
  		    break;
  		}
@@ -83,9 +81,21 @@ diff -ur wcstools-3.6.8/edhead.c wcstools-3.6.8.new/edhead.c
  	    }
  	fclose (fd);
  	free (header);
-diff -ur wcstools-3.6.8/getcol.c wcstools-3.6.8.new/getcol.c
---- wcstools-3.6.8/getcol.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/getcol.c	2007-03-19 18:25:09.000000000 +0100
+diff -ur wcstools-3.7.0/filename.c wcstools-3.7.0.new/filename.c
+--- wcstools-3.7.0/filename.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/filename.c	2007-09-07 21:32:59.000000000 +0200
+@@ -39,7 +39,7 @@
+ {
+     char *fn, *fn0;
+     char *str;
+-    char *name;
++    char *name = NULL;
+     char *is[10];
+     char *endroot;
+     int i, n;
+diff -ur wcstools-3.7.0/getcol.c wcstools-3.7.0.new/getcol.c
+--- wcstools-3.7.0/getcol.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/getcol.c	2007-09-07 21:00:14.000000000 +0200
 @@ -447,7 +447,7 @@
  		nop++;
  		}
@@ -95,10 +105,10 @@ diff -ur wcstools-3.6.8/getcol.c wcstools-3.6.8.new/getcol.c
  	    }
  
  	/* File to read */
-diff -ur wcstools-3.6.8/getdate.c wcstools-3.6.8.new/getdate.c
---- wcstools-3.6.8/getdate.c	2007-03-19 18:25:53.000000000 +0100
-+++ wcstools-3.6.8.new/getdate.c	2007-03-19 18:13:02.000000000 +0100
-@@ -409,7 +409,7 @@
+diff -ur wcstools-3.7.0/getdate.c wcstools-3.7.0.new/getdate.c
+--- wcstools-3.7.0/getdate.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/getdate.c	2007-09-07 21:00:41.000000000 +0200
+@@ -409,10 +409,10 @@
      int year, vyear;
      int lfd, oldfits;
      char outform[16];
@@ -106,10 +116,14 @@ diff -ur wcstools-3.6.8/getdate.c wcstools-3.6.8.new/getdate.c
 +    char *fitsdate = NULL, *newfdate, *stdate;
      char temp[64];
      char fyear[16];
-     char ts0[9];
-diff -ur wcstools-3.6.8/getpix.c wcstools-3.6.8.new/getpix.c
---- wcstools-3.6.8/getpix.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/getpix.c	2007-03-19 18:24:05.000000000 +0100
+-    char ts0[8];
++    char ts0[9];
+     char *tchar;
+     int its, its1;
+     time_t lts;
+diff -ur wcstools-3.7.0/getpix.c wcstools-3.7.0.new/getpix.c
+--- wcstools-3.7.0/getpix.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/getpix.c	2007-09-07 21:01:00.000000000 +0200
 @@ -68,7 +68,7 @@
      char *fn;
      char *rrange;       /* Row range string */
@@ -119,10 +133,10 @@ diff -ur wcstools-3.6.8/getpix.c wcstools-3.6.8.new/getpix.c
      char *dstr = NULL;
      char *cstr;
      int systemp;
-diff -ur wcstools-3.6.8/gettab.c wcstools-3.6.8.new/gettab.c
---- wcstools-3.6.8/gettab.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/gettab.c	2007-03-19 18:10:32.000000000 +0100
-@@ -559,7 +559,7 @@
+diff -ur wcstools-3.7.0/gettab.c wcstools-3.7.0.new/gettab.c
+--- wcstools-3.7.0/gettab.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/gettab.c	2007-09-07 21:01:31.000000000 +0200
+@@ -558,7 +558,7 @@
  char	*alias[]; /* Output names of keywords if different from input */
  
  {
@@ -131,9 +145,40 @@ diff -ur wcstools-3.6.8/gettab.c wcstools-3.6.8.new/gettab.c
      char *cstr, *cval, cvalue[64];
      int pass = 0;
      int drop;
-diff -ur wcstools-3.6.8/imfill.c wcstools-3.6.8.new/imfill.c
---- wcstools-3.6.8/imfill.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/imfill.c	2007-03-19 18:13:20.000000000 +0100
+diff -ur wcstools-3.7.0/imcat.c wcstools-3.7.0.new/imcat.c
+--- wcstools-3.7.0/imcat.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/imcat.c	2007-09-07 21:53:32.000000000 +0200
+@@ -109,9 +109,6 @@
+     char **fn;
+     int i, ic;
+     int nx, ny;
+-    char *header;
+-    double cra, cdec, dra, ddec, secpix;
+-    int wp, hp, bitpix;
+     double x, y;
+     char *refcatname[5];	/* reference catalog name */
+     int ncat = 0;
+@@ -123,7 +120,7 @@
+     int scat = 0;
+     char c1, c, *ccom;
+     double drot;
+-    struct WorldCoor *wcs = NULL; /* World coordinate system structure */
++    /*struct WorldCoor *wcs = NULL;*/ /* World coordinate system structure */
+ 
+     nfile = 0;
+     fn = (char **)calloc (maxnfile, sizeof(char *));
+@@ -1777,7 +1774,7 @@
+ 		    sprintf (headline, "%s	%s	%s	%5.1f	%5.1f	%d",
+ 		     numstr,rastr,decstr,gm[0][i],gm[1][i],gc[i]);
+ 		else if (refcat == SKYBOT)
+-		    sprintf (headline, "%s	%s	%s	%5.2f	%5.2f	%5.2f",
++		    sprintf (headline, "%s	%s	%s	%5.2f	%5.2f	%5.2f %5.2f",
+ 		     numstr,rastr,decstr,gm[0][i],gm[1][i],gm[2][i],gm[3][i]);
+ 		else if (refcat == UJC)
+ 		    sprintf (headline, "%s	%s	%s	%5.2f	%d",
+diff -ur wcstools-3.7.0/imfill.c wcstools-3.7.0.new/imfill.c
+--- wcstools-3.7.0/imfill.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/imfill.c	2007-09-07 21:01:55.000000000 +0200
 @@ -313,7 +313,7 @@
      int nfilled;
      int nbadpix;
@@ -143,9 +188,9 @@ diff -ur wcstools-3.6.8/imfill.c wcstools-3.6.8.new/imfill.c
      char newname[256];		/* Name for revised image */
      char *ltime;
      char *endchar;
-diff -ur wcstools-3.6.8/imsmooth.c wcstools-3.6.8.new/imsmooth.c
---- wcstools-3.6.8/imsmooth.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/imsmooth.c	2007-03-19 18:13:39.000000000 +0100
+diff -ur wcstools-3.7.0/imsmooth.c wcstools-3.7.0.new/imsmooth.c
+--- wcstools-3.7.0/imsmooth.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/imsmooth.c	2007-09-07 21:02:24.000000000 +0200
 @@ -263,7 +263,7 @@
      char *ext = NULL;
      char *newimage = NULL;
@@ -155,10 +200,10 @@ diff -ur wcstools-3.6.8/imsmooth.c wcstools-3.6.8.new/imsmooth.c
      char *fname;
      char extname[16];
      int lext = 0;
-diff -ur wcstools-3.6.8/imstack.c wcstools-3.6.8.new/imstack.c
---- wcstools-3.6.8/imstack.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/imstack.c	2007-03-19 18:24:43.000000000 +0100
-@@ -194,7 +194,7 @@
+diff -ur wcstools-3.7.0/imstack.c wcstools-3.7.0.new/imstack.c
+--- wcstools-3.7.0/imstack.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/imstack.c	2007-09-07 21:03:02.000000000 +0200
+@@ -199,7 +199,7 @@
  	    blanks = (char *) malloc ((size_t) nbytes);
  	    for (i = 0;  i < nbytes; i++)
  		blanks[i] = 0;
@@ -167,7 +212,7 @@ diff -ur wcstools-3.6.8/imstack.c wcstools-3.6.8.new/imstack.c
  	    free (blanks);
  	    }
  	}
-@@ -449,7 +449,7 @@
+@@ -475,7 +475,7 @@
  			    blanks = (char *) malloc ((size_t) nbytes);
  			    for (i = 0;  i < nbytes; i++)
  				blanks[i] = 0;
@@ -176,9 +221,9 @@ diff -ur wcstools-3.6.8/imstack.c wcstools-3.6.8.new/imstack.c
  			    free (blanks);
  			    }
  			}
-diff -ur wcstools-3.6.8/libwcs/binread.c wcstools-3.6.8.new/libwcs/binread.c
---- wcstools-3.6.8/libwcs/binread.c	2007-03-19 18:25:53.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/binread.c	2007-03-19 18:22:34.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/binread.c wcstools-3.7.0.new/libwcs/binread.c
+--- wcstools-3.7.0/libwcs/binread.c	2007-01-11 23:02:42.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/binread.c	2007-09-07 21:03:38.000000000 +0200
 @@ -505,7 +505,7 @@
      struct Star *star;
      char str[128];
@@ -193,13 +238,34 @@ diff -ur wcstools-3.6.8/libwcs/binread.c wcstools-3.6.8.new/libwcs/binread.c
      int jstar;
      int nstar;
 -    double mag;
-+    double mag = 0.;
++    double mag = 0;
      double num;
      int magsort;
      int istar = 0;
-diff -ur wcstools-3.6.8/libwcs/fileutil.c wcstools-3.6.8.new/libwcs/fileutil.c
---- wcstools-3.6.8/libwcs/fileutil.c	2007-01-11 22:57:29.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/fileutil.c	2007-03-19 18:23:34.000000000 +0100
+@@ -1372,7 +1372,7 @@
+ 	for (i = 0; i < nmag; i++) {
+ 	    moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2);
+ 	    if (sc->byteswapped)
+-		binswap2 (&st->mag[i], 2);
++		binswap2 ((char*)&st->mag[i], 2);
+ 	    st->xmag[i] = 0.01 * (double) st->mag[i];
+ 	    }
+ 	}
+diff -ur wcstools-3.7.0/libwcs/catutil.c wcstools-3.7.0.new/libwcs/catutil.c
+--- wcstools-3.7.0/libwcs/catutil.c	2007-07-23 23:00:32.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/catutil.c	2007-09-07 20:58:14.000000000 +0200
+@@ -737,7 +737,7 @@
+ 	    lname = 0;
+ 	else
+ 	    lname = strlen (refcatname);
+-	catname = (char *)calloc (lname + 16, 1);
++	catname = (char *)calloc (lname + 37, 1);
+ 	if (lname > 0)
+ 	    sprintf (catname, "%s sources", refcatname);
+ 	else
+diff -ur wcstools-3.7.0/libwcs/fileutil.c wcstools-3.7.0.new/libwcs/fileutil.c
+--- wcstools-3.7.0/libwcs/fileutil.c	2007-01-11 22:57:29.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/fileutil.c	2007-09-07 21:04:08.000000000 +0200
 @@ -343,7 +343,7 @@
      /* If line can be read, add null at the end of the first token */
      if (fgets (token, ncmax, diskfile) != NULL) {
@@ -209,21 +275,33 @@ diff -ur wcstools-3.6.8/libwcs/fileutil.c wcstools-3.6.8.new/libwcs/fileutil.c
  	    }
  
  	/* If only character is a control character, return a NULL */
-diff -ur wcstools-3.6.8/libwcs/findstar.c wcstools-3.6.8.new/libwcs/findstar.c
---- wcstools-3.6.8/libwcs/findstar.c	2007-01-10 18:35:23.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/findstar.c	2007-03-19 17:51:55.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/findstar.c wcstools-3.7.0.new/libwcs/findstar.c
+--- wcstools-3.7.0/libwcs/findstar.c	2007-01-10 18:35:23.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/findstar.c	2007-09-07 21:04:43.000000000 +0200
 @@ -747,7 +747,7 @@
      double sd = 0.0;
      int i;
      int npix;
 -    double dnpix;
-+    double dnpix = 0.;
++    double dnpix = 0;
      double sum;
  
      pmin = -1.0e20;
-diff -ur wcstools-3.6.8/libwcs/gsc2read.c wcstools-3.6.8.new/libwcs/gsc2read.c
---- wcstools-3.6.8/libwcs/gsc2read.c	2007-03-13 18:12:56.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/gsc2read.c	2007-03-19 18:21:39.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/fitsfile.c wcstools-3.7.0.new/libwcs/fitsfile.c
+--- wcstools-3.7.0/libwcs/fitsfile.c	2007-05-01 00:22:51.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/fitsfile.c	2007-09-07 21:44:46.000000000 +0200
+@@ -874,7 +874,7 @@
+     if (!simple) {
+ 	nbytes = getfilesize (filename) - nbhead;
+ 	if ((image = (char *) malloc (nbytes + 1)) == NULL) {
+-	    snprintf (fitserrmsg,79, "FITSRFULL:  %d-byte image buffer cannot be allocated\n");
++	    snprintf (fitserrmsg,79, "FITSRFULL:  %d-byte image buffer cannot be allocated\n", nbytes);
+ 	    (void)close (fd);
+ 	    return (NULL);
+ 	    }
+diff -ur wcstools-3.7.0/libwcs/gsc2read.c wcstools-3.7.0.new/libwcs/gsc2read.c
+--- wcstools-3.7.0/libwcs/gsc2read.c	2007-07-09 23:36:08.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/gsc2read.c	2007-09-07 21:06:03.000000000 +0200
 @@ -191,7 +191,7 @@
  
      /* Dump returned file and stop */
@@ -233,7 +311,7 @@ diff -ur wcstools-3.6.8/libwcs/gsc2read.c wcstools-3.6.8.new/libwcs/gsc2read.c
  	exit (0);
  	}
  
-@@ -294,7 +294,7 @@
+@@ -293,7 +293,7 @@
      char *databuff;
      char *lastbuff;
      char *oldbuff;
@@ -242,9 +320,18 @@ diff -ur wcstools-3.6.8/libwcs/gsc2read.c wcstools-3.6.8.new/libwcs/gsc2read.c
      int lhead, lbuff, i, j;
      char ctab = (char) 9;
      char ccom = ',';
-diff -ur wcstools-3.6.8/libwcs/gscread.c wcstools-3.6.8.new/libwcs/gscread.c
---- wcstools-3.6.8/libwcs/gscread.c	2007-01-10 19:17:17.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/gscread.c	2007-03-19 18:14:55.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/gscread.c wcstools-3.7.0.new/libwcs/gscread.c
+--- wcstools-3.7.0/libwcs/gscread.c	2007-07-05 18:05:03.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/gscread.c	2007-09-07 21:07:44.000000000 +0200
+@@ -512,7 +512,7 @@
+ 	    }
+ 
+ 	/* Close region input file */
+-	(void) close (ift);
++	close (ift);
+ 	itot = itot + itable;
+ 	if (nlog > 0)
+ 	    fprintf (stderr,"GSCREAD: %4d / %4d: %5d / %5d  / %5d sources from region %4d    \n",
 @@ -549,7 +549,7 @@
  int	*gtype;		/* Array of object types (returned) */
  int	nlog;		/* 1 for diagnostics */
@@ -263,6 +350,15 @@ diff -ur wcstools-3.6.8/libwcs/gscread.c wcstools-3.6.8.new/libwcs/gscread.c
      char *url;
  
      itot = 0;
+@@ -756,7 +756,7 @@
+ 	    }
+ 
+ 	/* Close region input file */
+-	(void) close (ift);
++	close (ift);
+ 	itot = itot + itable;
+ 	if (nlog > 0)
+ 	    fprintf (stderr,"GSCRNUM: %4d / %4d: %5d / %5d sources, region %4d.%04d\n",
 @@ -795,7 +795,7 @@
      int rlist[100];	/* List of input FITS tables files */
      char inpath[64];	/* Pathname for input FITS table file */
@@ -285,9 +381,51 @@ diff -ur wcstools-3.6.8/libwcs/gscread.c wcstools-3.6.8.new/libwcs/gscread.c
      double rra1, rra2, rdec1, rdec2;
      double rdist, ddist;
      char *str;
-diff -ur wcstools-3.6.8/libwcs/hput.c wcstools-3.6.8.new/libwcs/hput.c
---- wcstools-3.6.8/libwcs/hput.c	2007-01-16 18:18:13.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/hput.c	2007-03-19 18:02:03.000000000 +0100
+@@ -830,11 +830,11 @@
+ 
+     /* Set image parameters */
+     bitpix = 0;
+-    (void)hgeti4 (header, "BITPIX", &bitpix);
++    hgeti4 (header, "BITPIX", &bitpix);
+     w = 0;
+-    (void)hgeti4 (header, "NAXIS1", &w);
++    hgeti4 (header, "NAXIS1", &w);
+     h = 0;
+-    (void)hgeti4 (header, "NAXIS2", &h);
++    hgeti4 (header, "NAXIS2", &h);
+ 
+     if (refcat == GSCACT) {
+ 	if ((str = getenv("GSCACT_NORTH")) == NULL)
+@@ -1080,7 +1080,7 @@
+ 	    }
+ 
+ 	/* Close region input file */
+-	(void) close (ift);
++	close (ift);
+ 	itot = itot + itable;
+ 	if (nlog > 0)
+ 	    fprintf (stderr,"GSCBIN: %4d / %4d: %5d / %5d  / %5d sources from region %4d    \n",
+@@ -1321,7 +1321,7 @@
+ 	jr2 = 0;
+ 	}
+ 
+-    (void) close (ift);
++    close (ift);
+     return (nrgn);
+ }
+ 
+@@ -1381,7 +1381,7 @@
+ double min;		/* Minutes of declination */
+ 
+     /* Get declination sign from table */
+-    (void) ftgetc (fitsline, &rkw[sgncol], sgn, 3);
++    ftgetc (fitsline, &rkw[sgncol], sgn, 3);
+ 
+     /* Get degrees of declination from table */
+     deg = ftgetr8 (fitsline, &rkw[dcol]);
+diff -ur wcstools-3.7.0/libwcs/hput.c wcstools-3.7.0.new/libwcs/hput.c
+--- wcstools-3.7.0/libwcs/hput.c	2007-08-22 23:59:56.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/hput.c	2007-09-07 21:47:09.000000000 +0200
 @@ -273,7 +273,7 @@
  const char *cval;	/* character string containing the value for variable
  		   keyword.  trailing and leading blanks are removed.  */
@@ -297,10 +435,31 @@ diff -ur wcstools-3.6.8/libwcs/hput.c wcstools-3.6.8.new/libwcs/hput.c
      int comment = 0;
      const char *v;
      char keyroot[8], newkey[12], value[80];
-diff -ur wcstools-3.6.8/libwcs/imhfile.c wcstools-3.6.8.new/libwcs/imhfile.c
---- wcstools-3.6.8/libwcs/imhfile.c	2007-01-08 18:24:29.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/imhfile.c	2007-03-19 18:23:06.000000000 +0100
-@@ -910,7 +910,7 @@
+@@ -599,7 +599,7 @@
+     char squot, slash, space;
+     char line[100];
+     int lkeyword, lcom, lhead, i, lblank, ln, nc, lc;
+-    char *vp, *v1, *v2, *c0, *c1, *q1, *q2;
++    char *vp, *v1, *v2, *c0, *c1, *q1, *q2=NULL;
+ 
+     squot = (char) 39;
+     slash = (char) 47;
+diff -ur wcstools-3.7.0/libwcs/imgetwcs.c wcstools-3.7.0.new/libwcs/imgetwcs.c
+--- wcstools-3.7.0/libwcs/imgetwcs.c	2007-07-26 22:08:41.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/imgetwcs.c	2007-09-07 21:26:47.000000000 +0200
+@@ -381,7 +381,7 @@
+     double xref, yref, degpix, secpix;
+     struct WorldCoor *wcs;
+     char temp[16];
+-    char *cwcs;
++    char *cwcs = NULL;
+ 
+     /* Set the world coordinate system from the image header */
+     if (strlen (filename) > 0) {
+diff -ur wcstools-3.7.0/libwcs/imhfile.c wcstools-3.7.0.new/libwcs/imhfile.c
+--- wcstools-3.7.0/libwcs/imhfile.c	2007-01-08 18:24:29.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/imhfile.c	2007-09-07 21:09:34.000000000 +0200
+@@ -910,10 +910,10 @@
  
      /* Write IRAF header to disk file */
      nbw = write (fd, irafheader, nbhead);
@@ -308,10 +467,25 @@ diff -ur wcstools-3.6.8/libwcs/imhfile.c wcstools-3.6.8.new/libwcs/imhfile.c
 +    ftruncate (fd, nbhead);
      close (fd);
      if (nbw < nbhead) {
- 	(void)fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n",
-diff -ur wcstools-3.6.8/libwcs/imsetwcs.c wcstools-3.6.8.new/libwcs/imsetwcs.c
---- wcstools-3.6.8/libwcs/imsetwcs.c	2007-01-11 23:01:41.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/imsetwcs.c	2007-03-19 17:51:28.000000000 +0100
+-	(void)fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n",
++	fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n",
+ 		      hdrname, nbw, nbhead);
+ 	return (-1);
+ 	}
+diff -ur wcstools-3.7.0/libwcs/imrotate.c wcstools-3.7.0.new/libwcs/imrotate.c
+--- wcstools-3.7.0/libwcs/imrotate.c	2007-04-04 20:42:14.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/imrotate.c	2007-09-07 21:42:33.000000000 +0200
+@@ -371,7 +371,6 @@
+ 
+ {
+     static char flds[15][8];
+-    char ctype1[16], ctype2[16];
+     double ctemp1, ctemp2, ctemp3, ctemp4, naxis1, naxis2;
+     int i, n, ndec1, ndec2, ndec3, ndec4;
+ 
+diff -ur wcstools-3.7.0/libwcs/imsetwcs.c wcstools-3.7.0.new/libwcs/imsetwcs.c
+--- wcstools-3.7.0/libwcs/imsetwcs.c	2007-03-14 22:03:43.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/imsetwcs.c	2007-09-07 21:10:35.000000000 +0200
 @@ -136,22 +136,22 @@
      int nmax;		/* Maximum number of matches possible (nrg or nbs) */
      int lofld = 0;	/* Length of object name field in output */
@@ -335,19 +509,19 @@ diff -ur wcstools-3.6.8/libwcs/imsetwcs.c wcstools-3.6.8.new/libwcs/imsetwcs.c
      char rstr[32], dstr[32];
      double refeq, refep;
 -    double maxnum;
-+    double maxnum = 0.;
++    double maxnum = 0;
      int nnfld;
      int refsys;
      char refcoor[8];
-diff -ur wcstools-3.6.8/libwcs/imutil.c wcstools-3.6.8.new/libwcs/imutil.c
---- wcstools-3.6.8/libwcs/imutil.c	2007-01-11 20:51:15.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/imutil.c	2007-03-19 18:06:49.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/imutil.c wcstools-3.7.0.new/libwcs/imutil.c
+--- wcstools-3.7.0/libwcs/imutil.c	2007-01-11 20:51:15.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/imutil.c	2007-09-07 21:49:38.000000000 +0200
 @@ -164,7 +164,7 @@
  {
  char	*buffret;	/* Modified image buffer (returned) */
  int	nx,ny;		/* Number of columns and rows in image */
 -int	ix,iy;		/* Pixel around which to compute mean */
-+int	ix,iy = 0;		/* Pixel around which to compute mean */
++int	ix,iy = 0;	/* Pixel around which to compute mean */
  int	npix;		/* Number of pixels in image */
  int	bitpix;		/* Number of bits per pixel (<0=floating point) */
  int	bitpixb;	/* Number of bits per pixel in bad pixel file */
@@ -428,7 +602,7 @@ diff -ur wcstools-3.6.8/libwcs/imutil.c wcstools-3.6.8.new/libwcs/imutil.c
  char	*buffret;	/* Modified image buffer (returned) */
  int	nx,ny;		/* Number of columns and rows in image */
 -int	ix,iy;		/* Pixel around which to compute mean */
-+int	ix,iy = 0;		/* Pixel around which to compute mean */
++int	ix,iy = 0;	/* Pixel around which to compute mean */
  int	npix;		/* Number of pixels in image */
  int	bitpix;		/* Number of bits per pixel (<0=floating point) */
  int	checkmin = 0;
@@ -546,21 +720,21 @@ diff -ur wcstools-3.6.8/libwcs/imutil.c wcstools-3.6.8.new/libwcs/imutil.c
  int	npix;	/* Number of pixels in image */
  int	bitpix;	/* Number of bits per pixel (<0=floating point) */
  int	naxes;
-diff -ur wcstools-3.6.8/libwcs/proj.c wcstools-3.6.8.new/libwcs/proj.c
---- wcstools-3.6.8/libwcs/proj.c	2006-06-20 22:08:00.000000000 +0200
-+++ wcstools-3.6.8.new/libwcs/proj.c	2007-03-19 18:04:58.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/proj.c wcstools-3.7.0.new/libwcs/proj.c
+--- wcstools-3.7.0/libwcs/proj.c	2006-06-20 22:08:00.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/proj.c	2007-09-07 21:15:23.000000000 +0200
 @@ -3672,7 +3672,7 @@
  
  {
     int   face;
 -   double cthe, eta, l, m, n, rho, xi;
-+   double cthe, eta = 0., l, m, n, rho, xi = 0.;
++   double cthe, eta = 0, l, m, n, rho, xi = 0;
     const float tol = 1.0e-7;
  
     float a, a2, a2b2, a4, ab, b, b2, b4, ca2, cb2;
-diff -ur wcstools-3.6.8/libwcs/sdssread.c wcstools-3.6.8.new/libwcs/sdssread.c
---- wcstools-3.6.8/libwcs/sdssread.c	2007-01-10 19:24:44.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/sdssread.c	2007-03-19 18:21:55.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/sdssread.c wcstools-3.7.0.new/libwcs/sdssread.c
+--- wcstools-3.7.0/libwcs/sdssread.c	2007-01-10 19:24:44.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/sdssread.c	2007-09-07 21:15:41.000000000 +0200
 @@ -165,7 +165,7 @@
  
      /* Dump returned file and stop */
@@ -570,19 +744,85 @@ diff -ur wcstools-3.6.8/libwcs/sdssread.c wcstools-3.6.8.new/libwcs/sdssread.c
  	exit (0);
  	}
  
-diff -ur wcstools-3.6.8/libwcs/tabread.c wcstools-3.6.8.new/libwcs/tabread.c
---- wcstools-3.6.8/libwcs/tabread.c	2007-03-13 18:20:27.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/tabread.c	2007-03-19 18:22:23.000000000 +0100
-@@ -778,7 +778,7 @@
+diff -ur wcstools-3.7.0/libwcs/skybotread.c wcstools-3.7.0.new/libwcs/skybotread.c
+--- wcstools-3.7.0/libwcs/skybotread.c	2007-07-27 20:21:27.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/skybotread.c	2007-09-07 21:42:18.000000000 +0200
+@@ -125,12 +125,11 @@
+ int	nlog;		/* 1 for diagnostics */
+ {
+     char srchurl[LINE];
+-    char cmag;
+     char *obs;
+     char *dstr;
+     struct TabTable *tabtable;
+     struct StarCat *starcat; /* Star catalog data structure */
+-    double dtemp, jdout;
++    double jdout;
+     int nstar, nlog0;
+     double ra, dec, mag, dradi, dradx;
+     char rastr[32], decstr[32], temp[256], tstr[80];
+@@ -281,29 +280,22 @@
+ 
+     char *skybuff;	/* Input comma-separated table */
+ {
+-    char *heading;
+     char *colhead;
+     char *colsep;
+     char *tabbuff;	/* Output tab-separated table */
+     char *tbuff;
+-    char *databuff;
+     char *dbuff;
+     char *buffer;
+     char *lastbuff;
+-    char *endhead;
+     char *colend;
+-    char *chead;
+-    char *head;
+     char *tbuffi;
+     char temp[16], format[16];
+     int lbuff, i, lra, icol;
+-    int lhead, ldata;
++    int lhead;
+     int addname;
+     int lobj;
+     char cbuff;
+-    char *buff;
+     char cbar = '|';
+-    char ccom = ',';
+     char cminus = '-';
+     char cspace = ' ';
+     char ctab = (char) 9;
+diff -ur wcstools-3.7.0/libwcs/tabread.c wcstools-3.7.0.new/libwcs/tabread.c
+--- wcstools-3.7.0/libwcs/tabread.c	2007-07-23 23:02:01.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/tabread.c	2007-09-07 21:43:33.000000000 +0200
+@@ -147,7 +147,7 @@
+     int lname;
+     int imag;
+     double ra,dec, rapm, decpm;
+-    double mag, parallax, rv;
++    double mag = 0, parallax, rv;
+     double num;
+     int peak, i;
+     int istar, nstars, lstar;
+@@ -596,7 +596,7 @@
+ 		}
+ 
+ 	    /* Check ID number first */
+-	    (void) setoken (&startok, line, "tab");
++	    setoken (&startok, line, "tab");
+ 	    if (!strcmp (sc->isfil,"gsc-server")) {
+    		if (tabgetc (&startok, sc->entid, str, 24))
+ 		    num = 0.0;
+@@ -782,7 +782,7 @@
      int nstar;
      int imag;
      double ra,dec, rapm, decpm;
 -    double mag, parallax, rv;
-+    double mag = 0., parallax, rv;
++    double mag = 0, parallax, rv;
      double num;
      int peak;
      int istar, nstars, lstar;
-@@ -2149,7 +2149,7 @@
+@@ -2163,7 +2163,7 @@
  	tabtable->lline = (nextline - tabtable->tabdata) * 2;
  	tabtable->tabline = (char *) calloc (tabtable->lline, 1);
  	fseek (tabtable->tcat, (long) tabtable->lhead, SEEK_SET);
@@ -591,7 +831,16 @@ diff -ur wcstools-3.6.8/libwcs/tabread.c wcstools-3.6.8.new/libwcs/tabread.c
  	lline = strlen (tabtable->tabline);
  	if (tabtable->tabline[lline-1] < 32)
  	     tabtable->tabline[lline-1] = (char) 0;
-@@ -2231,7 +2231,7 @@
+@@ -2173,7 +2173,7 @@
+     /* Close catalog file if not reading one line at a time */
+     else {
+ 	tabtable->lhead = 0;
+-	(void) fclose (fcat);
++	fclose (fcat);
+ 	tabtable->tcat = NULL;
+ 	}
+ 
+@@ -2245,7 +2245,7 @@
  	    fseek (tabtable->tcat, (long) tabtable->lhead, SEEK_SET);
  	    tabtable->iline = 0;
  	    for (i = tabtable->iline; i < iline; i++) {
@@ -600,9 +849,26 @@ diff -ur wcstools-3.6.8/libwcs/tabread.c wcstools-3.6.8.new/libwcs/tabread.c
  		tabtable->iline++;
  		}
  	    lline = strlen (tabtable->tabline);
-diff -ur wcstools-3.6.8/libwcs/tmcread.c wcstools-3.6.8.new/libwcs/tmcread.c
---- wcstools-3.6.8/libwcs/tmcread.c	2007-01-10 19:09:43.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/tmcread.c	2007-03-19 17:57:35.000000000 +0100
+@@ -2648,7 +2648,6 @@
+     return (0);
+ }
+ 
+-
+ /* Search table of column headings for first with string (case-independent) */
+ 
+ static int
+diff -ur wcstools-3.7.0/libwcs/tmcread.c wcstools-3.7.0.new/libwcs/tmcread.c
+--- wcstools-3.7.0/libwcs/tmcread.c	2007-01-10 19:09:43.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/tmcread.c	2007-09-07 21:38:33.000000000 +0200
+@@ -105,7 +105,7 @@
+     double eqref=2000.0;	/* Catalog equinox */
+     double epref=2000.0;	/* Catalog epoch */
+     double size = 0.0;		/* Semi-major axis of extended source */
+-    struct StarCat *starcat;
++    struct StarCat *starcat = NULL;
+     struct Star *star;
+     int verbose;
+     int wrap;
 @@ -529,7 +529,7 @@
      int sysref=WCS_J2000;	/* Catalog coordinate system */
      double eqref=2000.0;	/* Catalog equinox */
@@ -612,31 +878,36 @@ diff -ur wcstools-3.6.8/libwcs/tmcread.c wcstools-3.6.8.new/libwcs/tmcread.c
      struct Star *star;
      char *str;
  
-diff -ur wcstools-3.6.8/libwcs/wcsinit.c wcstools-3.6.8.new/libwcs/wcsinit.c
---- wcstools-3.6.8/libwcs/wcsinit.c	2007-03-13 22:46:18.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/wcsinit.c	2007-03-19 17:56:56.000000000 +0100
-@@ -1072,7 +1072,7 @@
- static void
- wcseq (hstring, wcs)
+diff -ur wcstools-3.7.0/libwcs/wcs.c wcstools-3.7.0.new/libwcs/wcs.c
+--- wcstools-3.7.0/libwcs/wcs.c	2007-07-25 20:54:55.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/wcs.c	2007-09-07 21:37:11.000000000 +0200
+@@ -1415,8 +1415,8 @@
+ double	x2,y2;	/* (RA,Dec) or (Long,Lat) in degrees */
  
--char	*hstring;	/* character string containing FITS header information
-+const char	*hstring;	/* character string containing FITS header information
- 		   	in the format <keyword>= <value> [/ <comment>] */
- struct WorldCoor *wcs;	/* World coordinate system data structure */
  {
-@@ -1086,7 +1086,7 @@
+-	double xr1, xr2, yr1, yr2, r, diffi;
+-	double pos1[3], pos2[3], w, diff, cosb;
++	double diffi, r;
++	double pos1[3], pos2[3], w, diff;
+ 	int i;
+ 
+ 	/* Convert two vectors to direction cosines */
+diff -ur wcstools-3.7.0/libwcs/wcsinit.c wcstools-3.7.0.new/libwcs/wcsinit.c
+--- wcstools-3.7.0/libwcs/wcsinit.c	2007-04-28 01:25:47.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/wcsinit.c	2007-09-07 21:18:43.000000000 +0200
+@@ -1082,7 +1082,7 @@
  static void
- wcseqm (hstring, wcs, mchar)
+ wcseq (hstring, wcs)
  
 -char	*hstring;	/* character string containing FITS header information
 +const char	*hstring;	/* character string containing FITS header information
  		   	in the format <keyword>= <value> [/ <comment>] */
  struct WorldCoor *wcs;	/* World coordinate system data structure */
- char	*mchar;		/* Suffix character for one of multiple WCS */
-diff -ur wcstools-3.6.8/libwcs/webread.c wcstools-3.6.8.new/libwcs/webread.c
---- wcstools-3.6.8/libwcs/webread.c	2007-03-13 16:53:08.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/webread.c	2007-03-19 18:21:16.000000000 +0100
-@@ -248,7 +248,7 @@
+ {
+diff -ur wcstools-3.7.0/libwcs/webread.c wcstools-3.7.0.new/libwcs/webread.c
+--- wcstools-3.7.0/libwcs/webread.c	2007-08-28 17:27:19.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/webread.c	2007-09-07 21:38:10.000000000 +0200
+@@ -252,7 +252,7 @@
  
      /* Dump returned file and stop */
      if (nlog < 0) {
@@ -645,7 +916,7 @@ diff -ur wcstools-3.6.8/libwcs/webread.c wcstools-3.6.8.new/libwcs/webread.c
  	exit (0);
  	}
  
-@@ -374,7 +374,7 @@
+@@ -378,7 +378,7 @@
  
      /* Dump returned file and stop */
      if (nlog < 0) {
@@ -654,7 +925,7 @@ diff -ur wcstools-3.6.8/libwcs/webread.c wcstools-3.6.8.new/libwcs/webread.c
  	exit (0);
  	}
  
-@@ -572,7 +572,7 @@
+@@ -612,7 +612,7 @@
      fflush(sok);
      free (server);
  
@@ -663,27 +934,45 @@ diff -ur wcstools-3.6.8/libwcs/webread.c wcstools-3.6.8.new/libwcs/webread.c
  
      /* Skip continue lines
      if (status == 100) {
-@@ -606,7 +606,7 @@
- 	lline = 1;
+@@ -647,7 +647,7 @@
  	*lbuff = 0;
+ 	ltbuff = 0;
  	while (lline > 0) {
 -	    (void) fgets (linebuff, LINE, sok);
 +	    fgets (linebuff, LINE, sok);
  	    lline = strlen (linebuff);
  	    if (lline < 1)
  		break;
-@@ -642,7 +642,7 @@
- 		else {
- 		    buff = tabbuff + lcbuff;
- 		    }
--        	(void) fread (buff, 1, lchunk, sok);
-+        	fread (buff, 1, lchunk, sok);
- 		buff[lchunk] = (char) 0;
- 		if (diag)
- 		    fprintf (stderr, "%s\n", buff);
-diff -ur wcstools-3.6.8/scat.c wcstools-3.6.8.new/scat.c
---- wcstools-3.6.8/scat.c	2007-03-13 17:47:10.000000000 +0100
-+++ wcstools-3.6.8.new/scat.c	2007-03-19 18:08:13.000000000 +0100
+@@ -689,7 +689,7 @@
+ 	    else {
+ 		buff = tabbuff + lcbuff;
+ 		}
+-            (void) fread (buff, 1, lchunk, sok);
++            fread (buff, 1, lchunk, sok);
+ 	    buff[lchunk] = (char) 0;
+ 	    if (diag)
+ 		fprintf (stderr, "%s\n", buff);
+@@ -730,7 +730,7 @@
+ 		fprintf (stderr, "%s\n", buff);
+ 	    }
+ 	}
+-    (void) fclose (sok);
++    fclose (sok);
+ 
+     return (tabbuff);
+ }
+@@ -864,7 +864,7 @@
+ space2tab (tabbuff)
+     char *tabbuff;	/* Tab table filled with spaces */
+ {
+-    char *newbuff, *line0, *line1, *ic, *icn, *tstart;
++    char *newbuff, *line0, *line1, *ic, *icn;
+     char cspace, ctab, cdash;
+     int lbuff;
+     int alltab = 0;
+diff -ur wcstools-3.7.0/scat.c wcstools-3.7.0.new/scat.c
+--- wcstools-3.7.0/scat.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/scat.c	2007-09-07 21:31:23.000000000 +0200
 @@ -1101,7 +1101,7 @@
      double crao, cdeco;	/* Output center long/lat or RA/Dec in degrees */
      double epout = 0.0;
@@ -702,9 +991,18 @@ diff -ur wcstools-3.6.8/scat.c wcstools-3.6.8.new/scat.c
      int imag, nmagr;
      int sysout = 0;
      char sortletter = (char) 0;
-diff -ur wcstools-3.6.8/setpix.c wcstools-3.6.8.new/setpix.c
---- wcstools-3.6.8/setpix.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/setpix.c	2007-03-19 18:09:13.000000000 +0100
+@@ -2366,7 +2366,7 @@
+ 			    printf ("	%5.2f	%5.2f	%5.2f	%5.2f %5.2f",
+ 				    gm[0][0],gm[1][0],gm[2][0],gm[4][0],gm[5][0]);
+ 			else
+-			    printf (" %5.2f %5.2f %5.2f %5.2f",
++			    printf (" %5.2f %5.2f %5.2f %5.2f %5.2f",
+ 				    gm[0][0],gm[1][0],gm[2][0],gm[4][0],gm[5][0]);
+ 			}
+ 		    else if (refcat == HIP) {
+diff -ur wcstools-3.7.0/setpix.c wcstools-3.7.0.new/setpix.c
+--- wcstools-3.7.0/setpix.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/setpix.c	2007-09-07 21:22:50.000000000 +0200
 @@ -258,9 +258,9 @@
      int lhead;			/* Maximum number of bytes in FITS header */
      int nbhead;			/* Actual number of bytes in FITS header */
@@ -717,15 +1015,51 @@ diff -ur wcstools-3.6.8/setpix.c wcstools-3.6.8.new/setpix.c
      char *imext, *imext1;
      double bzero;		/* Zero point for pixel scaling */
      double bscale;		/* Scale factor for pixel scaling */
-diff -ur wcstools-3.6.8/wcshead.c wcstools-3.6.8.new/wcshead.c
---- wcstools-3.6.8/wcshead.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/wcshead.c	2007-03-19 18:09:34.000000000 +0100
+diff -ur wcstools-3.7.0/wcshead.c wcstools-3.7.0.new/wcshead.c
+--- wcstools-3.7.0/wcshead.c	2007-08-30 23:47:04.000000000 +0200
++++ wcstools-3.7.0.new/wcshead.c	2007-09-07 21:23:35.000000000 +0200
 @@ -211,7 +211,7 @@
      char *GetFITShead();
      char rastr[32], decstr[32], fform[8];
      struct WorldCoor *wcs, *GetWCSFITS();
 -    double wfrst, dwl, wlast, dxpix, zvel, vel;
-+    double wfrst, dwl, wlast, dxpix, zvel = 0., vel;
++    double wfrst, dwl, wlast, dxpix, zvel = 0, vel;
      int logwav = 0;
  
      if (rootdir){
+diff -ur wcstools-3.7.0/xy2sky.c wcstools-3.7.0.new/xy2sky.c
+--- wcstools-3.7.0/xy2sky.c	2007-08-30 23:47:04.000000000 +0200
++++ wcstools-3.7.0.new/xy2sky.c	2007-09-07 21:32:39.000000000 +0200
+@@ -46,9 +46,9 @@
+ static int ncm = 0;
+ static int printhead = 0;
+ static char printonly = 'n';
+-static int centerset = 0;
++/*static int centerset = 0;
+ static int sizeset = 0;
+-static int scaleset = 0;
++static int scaleset = 0;*/
+ static int version = 0;		/* If 1, print only program name and version */
+ 
+ static char *RevMsg = "XY2SKY WCSTools 3.7.0, 30 August 2007, Doug Mink (dmink@cfa.harvard.edu)";
+@@ -70,9 +70,9 @@
+     int entmag = 0;
+     int i, ic;
+     double x, y, mag;
+-    double cra, cdec, dra, ddec, secpix, drot;
++    double cra, cdec, dra, ddec, secpix;/*, drot;*/
+     double eqout = 0.0;
+-    double eqin = 0.0;
++    /*double eqin = 0.0;*/
+     int sysout = 0;
+     int wp, hp, nx, ny, lhead;
+     FILE *fd = NULL;
+@@ -82,7 +82,7 @@
+     char *header;
+     char *fn;
+     int bitpix = 0;
+-    struct WorldCoor *wcs;
++    struct WorldCoor *wcs = NULL;
+     char xstr[32], ystr[32], mstr[32];
+     char rastr[32], decstr[32];
+     char keyword[16];
diff --git a/wcstools3-shared.patch b/wcstools3-shared.patch
index c55bb70..a819e16 100644
--- a/wcstools3-shared.patch
+++ b/wcstools3-shared.patch
@@ -32,7 +32,7 @@ diff -ur wcstools-3.6.7.old/libwcs/Makefile wcstools-3.6.7/libwcs/Makefile
  CFLAGS= -g
  CC= cc
 -LIBWCS = libwcs/libwcs.a
-+LIBWCS = libwcs/libwcs.so
++LIBWCS = -L`pwd`/libwcs -lwcs
  LIBS = $(LIBWCS) -lm
  #CATLIBS = $(LIBS) -lnsl -lsocket
  CATLIBS = $(LIBS)