From fcbf45ca642544fccce5a61e7295cdfd681421c2 Mon Sep 17 00:00:00 2001 From: Luis Ibanez Date: Sun, 5 Sep 2010 21:59:25 +0000 Subject: [PATCH] ENH: Removed redundant copies of getopt.c and getopt.h. Now reusing the ones in codec/compat. --- mj2/CMakeLists.txt | 11 +++-- mj2/compat/getopt.c | 116 -------------------------------------------- mj2/compat/getopt.h | 14 ------ mj2/frames_to_mj2.c | 2 +- 4 files changed, 9 insertions(+), 134 deletions(-) delete mode 100644 mj2/compat/getopt.c delete mode 100644 mj2/compat/getopt.h diff --git a/mj2/CMakeLists.txt b/mj2/CMakeLists.txt index c1fa4bf3..97968a74 100644 --- a/mj2/CMakeLists.txt +++ b/mj2/CMakeLists.txt @@ -13,8 +13,10 @@ ENDIF(NOT BUILD_SHARED_LIBS) ADD_EXECUTABLE(frames_to_mj2 frames_to_mj2.c - compat/getopt.c - mj2_convert.c mj2.c ) + ${PROJECT_SOURCE_DIR}/codec/compat/getopt.c + mj2_convert.c + mj2.c + ) TARGET_LINK_LIBRARIES(frames_to_mj2 ${OPJ_PREFIX}openjpeg) IF(UNIX) TARGET_LINK_LIBRARIES(frames_to_mj2 m) @@ -22,7 +24,10 @@ ENDIF(UNIX) ADD_EXECUTABLE(mj2_to_frames mj2_to_frames.c - compat/getopt.c mj2_convert.c mj2.c ) + ${PROJECT_SOURCE_DIR}/codec/compat/getopt.c + mj2_convert.c + mj2.c + ) TARGET_LINK_LIBRARIES(mj2_to_frames ${OPJ_PREFIX}openjpeg) IF(UNIX) TARGET_LINK_LIBRARIES(mj2_to_frames m) diff --git a/mj2/compat/getopt.c b/mj2/compat/getopt.c deleted file mode 100644 index 5673f315..00000000 --- a/mj2/compat/getopt.c +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (c) 1987, 1993, 1994 - * 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 - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * 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. - * 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. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* 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 */ - -#include -#include -#include - -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 "" - -/* - * getopt -- - * Parse argc/argv argument vector. - */ -int getopt(nargc, nargv, ostr) -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 */ - - if (optreset || !*place) { /* update scanning pointer */ - optreset = 0; - if (optind >= nargc || *(place = nargv[optind]) != '-') { - place = EMSG; - return (-1); - } - if (place[1] && *++place == '-') { /* found "--" */ - ++optind; - place = EMSG; - return (-1); - } - } /* option letter okay? */ - if ((optopt = (int) *place++) == (int) ':' || - !(oli = strchr(ostr, optopt))) { - /* - * if the user didn't specify '-' as an option, - * assume it means -1. - */ - if (optopt == (int) '-') - return (-1); - if (!*place) - ++optind; - if (opterr && *ostr != ':') - (void) fprintf(stderr, - "%s: illegal option -- %c\n", __progname, optopt); - return (BADCH); - } - if (*++oli != ':') { /* don't need argument */ - optarg = NULL; - if (!*place) - ++optind; - } else { /* need an argument */ - if (*place) /* no white space */ - optarg = place; - else if (nargc <= ++optind) { /* no arg */ - place = EMSG; - if (*ostr == ':') - return (BADARG); - if (opterr) - (void) fprintf(stderr, - "%s: option requires an argument -- %c\n", - __progname, optopt); - return (BADCH); - } else /* white space */ - optarg = nargv[optind]; - place = EMSG; - ++optind; - } - return (optopt); /* dump back option letter */ -} diff --git a/mj2/compat/getopt.h b/mj2/compat/getopt.h deleted file mode 100644 index 23299d1b..00000000 --- a/mj2/compat/getopt.h +++ /dev/null @@ -1,14 +0,0 @@ -/* last review : october 29th, 2002 */ - -#ifndef _GETOPT_H_ -#define _GETOPT_H_ - -extern int opterr; -extern int optind; -extern int optopt; -extern int optreset; -extern char *optarg; - -extern int getopt(int nargc, char *const *nargv, const char *ostr); - -#endif /* _GETOPT_H_ */ diff --git a/mj2/frames_to_mj2.c b/mj2/frames_to_mj2.c index 671ec8e5..9a5ba640 100644 --- a/mj2/frames_to_mj2.c +++ b/mj2/frames_to_mj2.c @@ -36,7 +36,7 @@ #include "cio.h" #include "mj2.h" #include "mj2_convert.h" -#include "compat/getopt.h" +#include "getopt.h" /** Size of memory first allocated for MOOV box