From 3db384424bd7398ffbb7a355cab8f15f3add009f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 2 Oct 2016 19:24:58 +0200 Subject: New upstream version 1.9.1+repack --- cgats/License.txt | 22 ---------------------- cgats/License4.txt | 22 ++++++++++++++++++++++ cgats/Readme.txt | 2 +- cgats/afiles | 2 +- cgats/cgats.c | 7 +++++-- cgats/cgats.h | 6 ++++-- cgats/cgatsstd.c | 12 ++++++++---- cgats/pars.c | 6 +++++- cgats/pars.h | 13 ++++++++++++- cgats/parsstd.c | 6 +++++- 10 files changed, 63 insertions(+), 35 deletions(-) delete mode 100644 cgats/License.txt create mode 100644 cgats/License4.txt (limited to 'cgats') diff --git a/cgats/License.txt b/cgats/License.txt deleted file mode 100644 index 7655233..0000000 --- a/cgats/License.txt +++ /dev/null @@ -1,22 +0,0 @@ -************************************************************************* -Copyright (c) 1995-2002 Graeme W. Gill - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - -************************************************************************* diff --git a/cgats/License4.txt b/cgats/License4.txt new file mode 100644 index 0000000..6db70c8 --- /dev/null +++ b/cgats/License4.txt @@ -0,0 +1,22 @@ +************************************************************************* +Copyright (c) 1995-2015 Graeme W. Gill + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +************************************************************************* diff --git a/cgats/Readme.txt b/cgats/Readme.txt index 94f3e3d..89c554e 100644 --- a/cgats/Readme.txt +++ b/cgats/Readme.txt @@ -6,7 +6,7 @@ Package contents: ----------------- cgatslib.zip ZIP archive of the following files Readme.txt This file. -License.txt Important! - Permissions for use of this package. +License4.txt Important! - Permissions for use of this package. cgats.c CGATS Library source code. cgatsstd.c I/O and malloc source code. cgats.h CGATS Library include file. Note machine dependent defines. diff --git a/cgats/afiles b/cgats/afiles index e185eb7..5532110 100644 --- a/cgats/afiles +++ b/cgats/afiles @@ -1,5 +1,5 @@ Readme.txt -License.txt +License4.txt afiles cgats.c cgats.h diff --git a/cgats/cgats.c b/cgats/cgats.c index 3e6e642..3741a5d 100644 --- a/cgats/cgats.c +++ b/cgats/cgats.c @@ -3,7 +3,9 @@ * Committee for Graphics Arts Technologies Standards * CGATS.5 and IT8.7 family file I/O class * Version 2.05 - * + */ + +/* * Author: Graeme W. Gill * Date: 20/12/95 * @@ -11,9 +13,10 @@ * All rights reserved. * * This material is licensed with an "MIT" free use license:- - * see the License.txt file in this directory for licensing details. + * see the License4.txt file in this directory for licensing details. */ + /* Should add a function to promote a field type, ie. diff --git a/cgats/cgats.h b/cgats/cgats.h index bc0cdd7..bf5c94e 100644 --- a/cgats/cgats.h +++ b/cgats/cgats.h @@ -4,7 +4,9 @@ * Committee for Graphics Arts Technologies Standards * CGATS.5 and IT8.7 family file I/O class * Version 2.05 - * + */ + +/* * Author: Graeme W. Gill * Date: 20/12/95 * @@ -12,7 +14,7 @@ * All rights reserved. * * This material is licensed with an "MIT" free use license:- - * see the License.txt file in this directory for licensing details. + * see the License4.txt file in this directory for licensing details. */ /* Version of cgatslib release */ diff --git a/cgats/cgatsstd.c b/cgats/cgatsstd.c index d8fbb34..22c17ed 100644 --- a/cgats/cgatsstd.c +++ b/cgats/cgatsstd.c @@ -3,6 +3,11 @@ * cgats library stdio and malloc utility classes. * Version 2.05 * + * These are kept in a separate file to allow them to be + * selectively ommitted from the cgats library. + */ + +/* * Author: Graeme W. Gill * Date: 2002/10/24 * @@ -10,13 +15,12 @@ * All rights reserved. * * This material is licensed with an "MIT" free use license:- - * see the License.txt file in this directory for licensing details. - * - * These are kept in a separate file to allow them to be - * selectively ommitted from the cgats library. + * see the License4.txt file in this directory for licensing details. * */ + + #ifndef COMBINED_STD #include diff --git a/cgats/pars.c b/cgats/pars.c index 8a4e4b9..c3038d5 100644 --- a/cgats/pars.c +++ b/cgats/pars.c @@ -2,6 +2,9 @@ /* * Simple ASCII file parsing object. * Used as a base for the CGATS.5 and IT8.7 family file I/O class + */ + +/* * Version 2.05 * * Author: Graeme W. Gill @@ -11,9 +14,10 @@ * All rights reserved. * * This material is licensed with an "MIT" free use license:- - * see the License.txt file in this directory for licensing details. + * see the License4.txt file in this directory for licensing details. */ + #define _PARS_C_ /* Turn on implimentation code */ #include diff --git a/cgats/pars.h b/cgats/pars.h index 83bbdad..083a745 100644 --- a/cgats/pars.h +++ b/cgats/pars.h @@ -2,6 +2,9 @@ /* * Simple ASCII file parsing object. * Used as a base for the CGATS.5 and IT8.7 family file I/O class + */ + +/* * Version 2.01 * * Author: Graeme W. Gill @@ -11,9 +14,13 @@ * All rights reserved. * * This material is licensed with an "MIT" free use license:- - * see the License.txt file in this directory for licensing details. + * see the License4.txt file in this directory for licensing details. */ +#ifdef __cplusplus + extern "C" { +#endif + #undef CGATS_DEBUG_MALLOC /* Turns on partial support for filename and linenumber capture */ /* - - - - - - - - - - - - - - - - - - - - - */ @@ -237,6 +244,10 @@ extern parse *new_parse_al(cgatsAlloc *al, cgatsFile *fp); /* With allocator cla /* Available when SEPARATE_STD is not defined: */ extern parse *new_parse(cgatsFile *fp); /* Default allocator */ +#ifdef __cplusplus + } +#endif + #define PARS_H #endif /* PARS_H */ diff --git a/cgats/parsstd.c b/cgats/parsstd.c index 4443e0a..2246c97 100644 --- a/cgats/parsstd.c +++ b/cgats/parsstd.c @@ -1,6 +1,9 @@ /* * parse library stdio and malloc utility classes. + */ + +/* * Version 2.05 * * Author: Graeme W. Gill @@ -10,13 +13,14 @@ * All rights reserved. * * This material is licensed with an "MIT" free use license:- - * see the License.txt file in this directory for licensing details. + * see the License4.txt file in this directory for licensing details. * * These are kept in a separate file to allow them to be * selectively ommitted from the cgats library. * */ + #define _PARSSTD_C_ #ifndef COMBINED_STD -- cgit v1.2.3