Merge pull request #459 from olebole/noirlab-minor

NOIRLAB: minor bugfixes and cleanups

Author: olebole

noao/astutil/t_setairmass.x

@@ -216,10 +216,10 @@ begin
 #		    if (fmt == NO && day == day1)
 #			call imastr (im, Memc[utm_key], Memc[ut_hms])
 #		    else if (dtm_encode (Memc[datestr], SZ_FNAME,
-#			year, month, day, utmid, 2, 0) > 0)
+#			year, month, day, ut_mid, 2, 0) > 0)
 #			call imastr (im, Memc[utm_key], Memc[datestr])
 		    if (dtm_encode (Memc[datestr], SZ_FNAME,
-			year, month, day, utmid, 2, 0) > 0)
+			year, month, day, ut_mid, 2, 0) > 0)
 			call imastr (im, Memc[utm_key], Memc[datestr])
 		}
 	    }

pkg/ecl/config.h

@@ -14,7 +14,7 @@
  *   this can be fixed.
  */
 #define	STACKSIZ	256000
-#define	DICTSIZE	1024000
+#define	DICTSIZE	8192000
 #define	MEMINCR		4096
 
 typedef unsigned long memel;	/* type for dictionary, stack, etc.	*/

pkg/images/tv/wcslab/zz.x

@@ -25,5 +25,4 @@ begin
 
 	do irow = 1, numrow
 		Memi[rowptr+irow-1] = irow
-
 end

pkg/utilities/nttools/lib/allrows.x

@@ -55,6 +55,5 @@ begin
 	}
 
 	# Remove the temporary row
-
 	call tbrdel (tp, ndx, ndx)
 end

pkg/utilities/nttools/lib/reorder.x

@@ -53,21 +53,12 @@ bool	doit
 pointer	sp, fname
 
 bool	clgetb(), is_wholetab()
-int	access(), tbtacc(), strncmp()
+int	access(), tbtacc()
 
 begin
 	call smark (sp)
 	call salloc (fname, SZ_FNAME, TY_CHAR)
 
-	# Check to make sure the deletion is OK
-
-	if (strncmp ("http:", file, 5) == 0) {
-	    call eprintf ("Cannot delete URL `%s'\n")
-	        call pargstr (file)
-	    call sfree (sp)
-	    return
-	}
-
 	if (verify) {
 	    if (tbtacc (file) == NO) {
 		# If table does not exist, warn user 

pkg/utilities/nttools/tcopy/tdelete.x

@@ -26,6 +26,9 @@ define	exit_ 91
 begin
 	status = NO
 
+        if (fname[1] <= NULL)
+            goto exit_
+
 	# Ignore any whitespace at the beginning of the filename.
 	for (ip=1;  IS_WHITE (fname[ip]);  ip=ip+1)
 	    ;

sys/fio/access.x

@@ -209,15 +209,15 @@ v2start_
 	    } else if (i_miiwrc (fp, IM_PIXFILE(im), SZ_V2IMPIXFILE) == ERR)
 		goto v2done_
 
-	    call oif_trim (IM_HDRFILE(im), SZ_V2IMHDRFILE)
+	    call oif_strim (IM_HDRFILE(im), SZ_V2IMHDRFILE)
 	    if (i_miiwrc (fp, IM_HDRFILE(im), SZ_V2IMHDRFILE) == ERR)
 		goto v2done_
 
-	    call oif_trim (IM_TITLE(im), SZ_V2IMTITLE)
+	    call oif_strim (IM_TITLE(im), SZ_V2IMTITLE)
 	    if (i_miiwrc (fp, IM_TITLE(im), SZ_V2IMTITLE) == ERR)
 		goto v2done_
 
-	    call oif_trim (IM_HISTORY(im), SZ_V2IMHIST)
+	    call oif_strim (IM_HISTORY(im), SZ_V2IMHIST)
 	    if (i_miiwrc (fp, IM_HISTORY(im), SZ_V2IMHIST) == ERR)
 		goto v2done_
 
@@ -238,11 +238,11 @@ v2done_
 end
 
 
-# OIF_TRIM -- Trim trailing garbage at the end of a string.  This does not
+# OIF_STRIM -- Trim trailing garbage at the end of a string.  This does not
 # affect the value of the string, but makes the contents of the output file
 # clearer when examined with file utilities.
 
-procedure oif_trim (s, nchars)
+procedure oif_strim (s, nchars)
 
 char	s[ARB]
 int	nchars

sys/imfort/imwrhdr.x

@@ -29,12 +29,8 @@ int	sz_pixel, inbounds, npix, xstep, n
 pointer	imgibf()
 int	imsinb(), imloop(), pl_p2ri(), sizeof()
 errchk	imgibf, imrdpx, imrbpx
-include <szpixtype.inc>
 
 begin
-	#sz_pixel = sizeof(IM_PIXTYPE(im))
-	#sz_pixel = max ( sizeof(dtype), sizeof(IM_PIXTYPE(im)) )
-	#sz_pixel = pix_size[IM_PIXTYPE(im)]
 	sz_pixel = sizeof(IM_PIXTYPE(im))
 	rlio = (and (IM_PLFLAGS(im), PL_RLIO+PL_FAST) == PL_RLIO)
 

sys/imio/imggsc.x

@@ -289,7 +289,6 @@ int	ip, op
 char	url[SZ_PATHNAME], cfname[SZ_PATHNAME]
 
 int	strncmp(), strlen()
-bool	envgetb()
 
 begin
 	# Check for a URL-encoded string.