Mercurial > hg > minc-tools

changeset 752:4b28650e0869

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mods to make irix 5 lint happy.
author neelin <neelin>
date Thu, 09 Feb 1995 14:08:24 +0000
parents 28c78bdbca44
children 76dd5561004e
files conversion/scxtominc/Makefile conversion/scxtominc/scxtominc.c progs/mincreshape/Makefile progs/mincreshape/mincreshape.c progs/mincview/Makefile progs/mincview/invert_raw_image.c
diffstat 6 files changed, 23 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/conversion/scxtominc/Makefile
+++ b/conversion/scxtominc/Makefile
@@ -36,7 +36,7 @@
 $(PROG_OBJ) $(EXTRA_OBJS) $(LINT_LIST) $(LINT_EXTRA) : Makefile
 
 .c.ln:#                                   defines the rule for creating .ln
-	lint $(LINTFLAGS) -c $< -o $@
+	$(LINT) $(LINTFLAGS) -c $< -o $@
 
 .c.o:#                                    defines the rule for creating .o
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -54,7 +54,8 @@
 lint: $(LINT_LIST_EXE)
 
 $(LINT_LIST_EXE) : $(TARGET_IN_DEPENDENCY)ln $(LINT_EXTRA) $(LINT_PROG_LIB) $(LINT_MINC_LIB)
-	lint -u $(LINTFLAGS) $@ln $(LINT_EXTRA) $(LINT_PROG_LIB) $(LINT_MINC_LIB)
+	$(LINT) $(LINT_PROGOPTS) $(LINTFLAGS) $@ln $(LINT_EXTRA) \
+	      $(LINT_PROG_LIB) $(LINT_MINC_LIB)
 
 # Remove all derived files in this directory
 clean:
--- a/conversion/scxtominc/scxtominc.c
+++ b/conversion/scxtominc/scxtominc.c
@@ -9,9 +9,12 @@
 @CALLS      : 
 @CREATED    : January 11, 1993 (Peter Neelin)
 @MODIFIED   : $Log: scxtominc.c,v $
-@MODIFIED   : Revision 2.4  1995-02-08 19:31:47  neelin
-@MODIFIED   : Moved ARGSUSED statements for irix 5 lint.
+@MODIFIED   : Revision 2.5  1995-02-09 14:11:43  neelin
+@MODIFIED   : Mods to make irix 5 lint happy.
 @MODIFIED   :
+ * Revision 2.4  1995/02/08  19:31:47  neelin
+ * Moved ARGSUSED statements for irix 5 lint.
+ *
  * Revision 2.3  1995/01/23  09:21:13  neelin
  * Changed ncclose to miclose
  *
@@ -53,7 +56,7 @@
 ---------------------------------------------------------------------------- */
 
 #ifndef lint
-static char rcsid[]="$Header: /private-cvsroot/minc/conversion/scxtominc/scxtominc.c,v 2.4 1995-02-08 19:31:47 neelin Exp $";
+static char rcsid[]="$Header: /private-cvsroot/minc/conversion/scxtominc/scxtominc.c,v 2.5 1995-02-09 14:11:43 neelin Exp $";
 #endif
 
 #include <stdlib.h>
@@ -1206,6 +1209,7 @@
                      short *image, int image_size, 
                      long pixel_max, float image_max,
                      double scan_time, double time_width, double zpos)
+     /*ARGSUSED*/
 {
    double pixmin, pixmax;
    long ipix, npix;
--- a/progs/mincreshape/Makefile
+++ b/progs/mincreshape/Makefile
@@ -43,7 +43,7 @@
 $(PROG_OBJ) $(LINT_LIST) $(EXTRA_OBJS) $(LINT_EXTRA) : Makefile
 
 .c.ln:#                                   defines the rule for creating .ln
-	lint $(LINTFLAGS) -c $< -o $@
+	$(LINT) $(LINTFLAGS) -c $< -o $@
 
 .c.o:#                                    defines the rule for creating .o
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -61,7 +61,8 @@
 lint: $(LINT_LIST_EXE)
 
 $(LINT_LIST_EXE) : $$@ln $(LINT_EXTRA) $(LINT_PROG_LIB) $(LINT_MINC_LIB)
-	lint -u $(LINTFLAGS) $@ln $(LINT_EXTRA) $(LINT_PROG_LIB) $(LINT_MINC_LIB)
+	$(LINT) $(LINT_PROGOPTS) $(LINTFLAGS) $@ln $(LINT_EXTRA) \
+	      $(LINT_PROG_LIB) $(LINT_MINC_LIB)
 
 # how to make man pages
 .man1.1:
--- a/progs/mincreshape/mincreshape.c
+++ b/progs/mincreshape/mincreshape.c
@@ -12,9 +12,12 @@
 @CALLS      : 
 @CREATED    : March 10, 1994 (Peter Neelin)
 @MODIFIED   : $Log: mincreshape.c,v $
-@MODIFIED   : Revision 1.5  1995-02-08 19:31:47  neelin
-@MODIFIED   : Moved ARGSUSED statements for irix 5 lint.
+@MODIFIED   : Revision 1.6  1995-02-09 14:08:24  neelin
+@MODIFIED   : Mods to make irix 5 lint happy.
 @MODIFIED   :
+ * Revision 1.5  1995/02/08  19:31:47  neelin
+ * Moved ARGSUSED statements for irix 5 lint.
+ *
  * Revision 1.4  1994/11/23  11:47:05  neelin
  * Handle image-min/max properly when using icv for normalization.
  *
@@ -41,7 +44,7 @@
 ---------------------------------------------------------------------------- */
 
 #ifndef lint
-static char rcsid[]="$Header: /private-cvsroot/minc/progs/mincreshape/mincreshape.c,v 1.5 1995-02-08 19:31:47 neelin Exp $";
+static char rcsid[]="$Header: /private-cvsroot/minc/progs/mincreshape/mincreshape.c,v 1.6 1995-02-09 14:08:24 neelin Exp $";
 #endif
 
 #include <stdlib.h>
@@ -49,6 +52,7 @@
 #include <float.h>
 #include <limits.h>
 #include <string.h>
+#include <ctype.h>
 #include <math.h>
 #include <minc.h>
 #include <ParseArgv.h>
--- a/progs/mincview/Makefile
+++ b/progs/mincview/Makefile
@@ -41,7 +41,7 @@
 $(PROG_OBJ) $(LINT_LIST) : Makefile
 
 .c.ln:#                                   defines the rule for creating .ln
-	lint $(LINTFLAGS) -c $< -o $@
+	$(LINT) $(LINTFLAGS) -c $< -o $@
 
 .c.o:#                                    defines the rule for creating .o
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -54,7 +54,7 @@
 lint: $(LINT_LIST_EXE)
 
 $(LINT_LIST_EXE) : $(TARGET_IN_DEPENDENCY)ln
-	lint -u $(LINTFLAGS) $@ln
+	$(LINT) $(LINT_PROGOPTS) $(LINTFLAGS) $@ln
 
 # how to make man pages
 .man1.1:
--- a/progs/mincview/invert_raw_image.c
+++ b/progs/mincview/invert_raw_image.c
@@ -36,7 +36,7 @@
    pname=argv[0];
    if ((argc != 3)&&(argc != 4)) {
       (void) fprintf(stderr,"Usage : %s xsize ysize <bytesperpixel>\n",pname);
-      (void) exit(ERROR_STATUS);
+      exit(ERROR_STATUS);
    }
    xsize = atol(argv[1]);
    ysize = atol(argv[2]);