openjpeg version 1.0 (previous version still available with tag opj0-97)

2 files changed, 32 insertions, 36 deletions

diff --git a/codec/compat/getopt.c b/codec/compat/getopt.c
index d0082c51..d5420acb 100644
--- a/codec/compat/getopt.c
+++ b/codec/compat/getopt.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1987, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
+ *  The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,8 +12,8 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -34,48 +34,44 @@
 /* last review : october 29th, 2002 */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getopt.c	8.3 (Berkeley) 4/27/95";
-#endif				/* LIBC_SCCS and not lint */
+static char sccsid[] = "@(#)getopt.c  8.3 (Berkeley) 4/27/95";
+#endif        /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-int opterr = 1,			/* if error message should be printed */
- optind = 1,			/* index into parent argv vector */
- optopt,			/* character checked for validity */
- optreset;			/* reset getopt */
-char *optarg;			/* argument associated with option */
+int opterr = 1,     /* if error message should be printed */
+ optind = 1,      /* index into parent argv vector */
+ optopt,      /* character checked for validity */
+ optreset;      /* reset getopt */
+char *optarg;     /* argument associated with option */
 
-#define	BADCH	(int)'?'
-#define	BADARG	(int)':'
-#define	EMSG	""
+#define BADCH (int)'?'
+#define BADARG  (int)':'
+#define EMSG  ""
 
 /*
  * getopt --
- *	Parse argc/argv argument vector.
+ *  Parse argc/argv argument vector.
  */
-int getopt(nargc, nargv, ostr)
-int nargc;
-char *const *nargv;
-const char *ostr;
-{
+int getopt(int nargc, char *const *nargv, const char *ostr) {
 #  define __progname nargv[0]
-  static char *place = EMSG;	/* option letter processing */
-  char *oli;			/* option letter list index */
+  static char *place = EMSG;  /* option letter processing */
+  char *oli;      /* option letter list index */
 
-  if (optreset || !*place) {	/* update scanning pointer */
+  if (optreset || !*place) {  /* update scanning pointer */
     optreset = 0;
     if (optind >= nargc || *(place = nargv[optind]) != '-') {
       place = EMSG;
       return (-1);
     }
-    if (place[1] && *++place == '-') {	/* found "--" */
+    if (place[1] && *++place == '-') {  /* found "--" */
       ++optind;
       place = EMSG;
       return (-1);
     }
-  }				/* option letter okay? */
+  }       /* option letter okay? */
   if ((optopt = (int) *place++) == (int) ':' ||
       !(oli = strchr(ostr, optopt))) {
     /*
@@ -88,29 +84,29 @@ const char *ostr;
       ++optind;
     if (opterr && *ostr != ':')
       (void) fprintf(stderr,
-		     "%s: illegal option -- %c\n", __progname, optopt);
+         "%s: illegal option -- %c\n", __progname, optopt);
     return (BADCH);
   }
-  if (*++oli != ':') {		/* don't need argument */
+  if (*++oli != ':') {    /* don't need argument */
     optarg = NULL;
     if (!*place)
       ++optind;
-  } else {			/* need an argument */
-    if (*place)			/* no white space */
+  } else {      /* need an argument */
+    if (*place)     /* no white space */
       optarg = place;
-    else if (nargc <= ++optind) {	/* no arg */
+    else if (nargc <= ++optind) { /* no arg */
       place = EMSG;
       if (*ostr == ':')
-	return (BADARG);
+  return (BADARG);
       if (opterr)
-	(void) fprintf(stderr,
-		       "%s: option requires an argument -- %c\n",
-		       __progname, optopt);
+  (void) fprintf(stderr,
+           "%s: option requires an argument -- %c\n",
+           __progname, optopt);
       return (BADCH);
-    } else			/* white space */
+    } else      /* white space */
       optarg = nargv[optind];
     place = EMSG;
     ++optind;
   }
-  return (optopt);		/* dump back option letter */
+  return (optopt);    /* dump back option letter */
 }
diff --git a/codec/compat/getopt.h b/codec/compat/getopt.h
index ab9c1a7b..c2b4ddde 100644
--- a/codec/compat/getopt.h
+++ b/codec/compat/getopt.h
@@ -11,4 +11,4 @@ extern char *optarg;
 
 extern int getopt(int nargc, char *const *nargv, const char *ostr);
 
-#endif				/* _GETOPT_H_ */
+#endif        /* _GETOPT_H_ */