From 0ac918df2188eeab0a61f33b503c79243bcd1cf0 Mon Sep 17 00:00:00 2001 From: Binh-Minh Date: Fri, 1 Dec 2023 14:04:43 -0500 Subject: [PATCH] Replace NCSA references Replaced NCSA with Library/library where appropriate --- hdf/src/dffunc.inc | 23 ++++++++++++----------- hdf/src/hdf.inc | 25 +++++++++++++------------ hdf/src/hfile.c | 6 +++--- hdf/src/hfile.h | 20 ++++++++++---------- hdf/src/src.inc | 25 +++++++++++++------------ hdf/src/vgp.c | 7 ------- hdf/test/egfhi.f | 1 - hdf/util/fp2hdf.c | 20 -------------------- hdf/util/hdf24to8.c | 3 --- mfhdf/hdfimport/hdfimport.c | 28 ---------------------------- mfhdf/hdiff/hdiff_dim.h | 23 ++++++++++++----------- mfhdf/hdiff/hdiff_list.h | 23 ++++++++++++----------- mfhdf/hdiff/hdiff_mattbl.h | 23 ++++++++++++----------- mfhdf/hdiff/hdiff_table.h | 23 ++++++++++++----------- mfhdf/hrepack/hrepack_check.c | 23 ++++++++++++----------- mfhdf/hrepack/hrepack_dim.h | 23 ++++++++++++----------- mfhdf/hrepack/hrepack_vg.h | 23 ++++++++++++----------- mfhdf/libsrc/nssdc.c | 2 +- 18 files changed, 136 insertions(+), 185 deletions(-) diff --git a/hdf/src/dffunc.inc b/hdf/src/dffunc.inc index e4cb46b97d..b61d493a62 100644 --- a/hdf/src/dffunc.inc +++ b/hdf/src/dffunc.inc @@ -1,14 +1,15 @@ -C**************************************************************************** -C* NCSA HDF * -C* Software Development Group * -C* National Center for Supercomputing Applications * -C* University of Illinois at Urbana-Champaign * -C* 605 E. Springfield, Champaign IL 61820 * -C* * -C* For conditions of distribution and use, see the accompanying * -C* hdf/COPYING file. * -C* * -C**************************************************************************** +C* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +C* Copyright by The HDF Group. * +C* Copyright by the Board of Trustees of the University of Illinois. * +C* All rights reserved. * +C* * +C* This file is part of HDF. The full HDF copyright notice, including * +C* terms governing use, modification, and redistribution, is contained in * +C* the COPYING file, which can be found at the root of the source code * +C* distribution tree, or in https://support.hdfgroup.org/ftp/HDF/releases/. * +C* If you do not have access to either file, you may request a copy from * +C* help@hdfgroup.org. * +C* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * C C C dffunc.inc diff --git a/hdf/src/hdf.inc b/hdf/src/hdf.inc index 4f69c15415..c634bd8201 100644 --- a/hdf/src/hdf.inc +++ b/hdf/src/hdf.inc @@ -1,15 +1,16 @@ -C**************************************************************************** -C* NCSA HDF * -C* Software Development Group * -C* National Center for Supercomputing Applications * -C* University of Illinois at Urbana-Champaign * -C* 605 E. Springfield, Champaign IL 61820 * -C* * -C* For conditions of distribution and use, see the accompanying * -C* hdf/COPYING file. * -C* * -C**************************************************************************** -C +C* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +C* Copyright by The HDF Group. * +C* Copyright by the Board of Trustees of the University of Illinois. * +C* All rights reserved. * +C* * +C* This file is part of HDF. The full HDF copyright notice, including * +C* terms governing use, modification, and redistribution, is contained in * +C* the COPYING file, which can be found at the root of the source code * +C* distribution tree, or in https://support.hdfgroup.org/ftp/HDF/releases/. * +C* If you do not have access to either file, you may request a copy from * +C* help@hdfgroup.org. * +C* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + C C *----------------------------------------------------------------------------- C * File: hdf.inc diff --git a/hdf/src/hfile.c b/hdf/src/hfile.c index 12d0edf117..5656606c42 100644 --- a/hdf/src/hfile.c +++ b/hdf/src/hfile.c @@ -2323,11 +2323,11 @@ HIunlock(filerec_t *file_rec) /* ------------------------- SPECIAL TAG ROUTINES ------------------------- */ /* The HDF tag space is divided as follows based on the 2 highest bits: - 00: NCSA reserved ordinary tags - 01: NCSA reserved special tags + 00: Library reserved ordinary tags + 01: Library reserved special tags 10, 11: User tags. - It is relatively cheap to operate with special tags within the NCSA + It is relatively cheap to operate with special tags within the library reserved tags range. For users to specify special tags and their corresponding ordinary tag, the pair has to be added to the special_table. diff --git a/hdf/src/hfile.h b/hdf/src/hfile.h index b41b5657bb..46d363e4ce 100644 --- a/hdf/src/hfile.h +++ b/hdf/src/hfile.h @@ -130,20 +130,20 @@ typedef int hdf_file_t; tag/ref (unique data identifier in file) Tag -- identifies the type of data, 16 bit unsigned integer whose - value ranges from 1 - 65535. Tags are assigned by NCSA. + value ranges from 1 - 65535. Tags are assigned by the library. The HDF tag space is divided as follows based on the 2 highest bits: - 00: NCSA reserved ordinary tags - 01: NCSA reserved special tags(i.e. regular tags made into + 00: Library reserved ordinary tags + 01: Library reserved special tags(i.e. regular tags made into linked-block, external, compressed or chunked.) 10, 11: User tags. Current tag assignments are: - 00001 - 32767 - reserved for NCSA use - 00001 - 16383 - NCSA regular tags - 16384 - 32767 - NCSA special tags - 32768 - 64999 - user definable + 00001 - 32767 - reserved for library use + 00001 - 16383 - library use regular tags + 16384 - 32767 - library use special tags + 32768 - 64999 - user definable tags 65000 - 65535 - reserved for expansion of format Reference number - 16 bit unsigned integer whose assignment is not @@ -380,11 +380,11 @@ typedef struct functab_t { /* --------------------------- Special Elements --------------------------- */ /* The HDF tag space is divided as follows based on the 2 highest bits: - 00: NCSA reserved ordinary tags - 01: NCSA reserved special tags(e.g. linked-block, external, compressed,..) + 00: Library reserved ordinary tags + 01: Library reserved special tags(e.g. linked-block, external, compressed,..) 10, 11: User tags. - It is relatively cheap to operate with special tags within the NCSA + It is relatively cheap to operate with special tags within the library reserved tags range. For users to specify special tags and their corresponding ordinary tag, the pair has to be added to the special_table in hfile.c and SPECIAL_TABLE must be defined. */ diff --git a/hdf/src/src.inc b/hdf/src/src.inc index c9861e0a3a..50f0b8930f 100644 --- a/hdf/src/src.inc +++ b/hdf/src/src.inc @@ -1,15 +1,16 @@ -# **************************************************************************** -# * NCSA HDF * -# * Software Development Group * -# * National Center for Supercomputing Applications * -# * University of Illinois at Urbana-Champaign * -# * 605 E. Springfield, Champaign IL 61820 * -# * * -# * For conditions of distribution and use, see the accompanying * -# * hdf/COPYING file. * -# * * -# *************************************************************************** -# +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * Copyright by the Board of Trustees of the University of Illinois. * + * All rights reserved. * + * * + * This file is part of HDF. The full HDF copyright notice, including * + * terms governing use, modification, and redistribution, is contained in * + * the COPYING file, which can be found at the root of the source code * + * distribution tree, or in https://support.hdfgroup.org/ftp/HDF/releases/. * + * If you do not have access to either file, you may request a copy from * + * help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + # # ################################################################## # diff --git a/hdf/src/vgp.c b/hdf/src/vgp.c index 5a6d304432..ad13c99c3e 100644 --- a/hdf/src/vgp.c +++ b/hdf/src/vgp.c @@ -1404,8 +1404,6 @@ NAME DESCRIPTION Checks to see if the given field exists in a vdata belonging to this vgroup. - 28-MAR-91 Jason Ng NCSA - RETURNS If found, returns the ref of the vdata. If not found, or error, returns FAIL @@ -1468,7 +1466,6 @@ NAME DESCRIPTION Checks whether the given tag/ref pair already exists in the vgroup. - 28-MAR-91 Jason Ng NCSA RETURNS RETURNS TRUE if exist @@ -1619,7 +1616,6 @@ NAME DESCRIPTION Returns the number (0 or +ve integer) of tag/ref pairs in a vgroup. If error, returns FAIL - 28-MAR-91 Jason Ng NCSA. RETURNS @@ -1708,7 +1704,6 @@ DESCRIPTION Returns n tag/ref pairs from the vgroup into the caller-supplied arrays tagrarray and refarray. n can be any +ve number, but arrays must be this big. - 28-MAR-91 Jason Ng NCSA. NOTE: Do not confuse with Vgettagref(). @@ -1764,7 +1759,6 @@ NAME DESCRIPTION Returns a specified tag/ref pair from the vgroup. User specifies an index. - 12-MAY-91 Jason Ng NCSA. NOTE: Do not confuse with Vgettagrefs(). @@ -1901,7 +1895,6 @@ DESCRIPTION a 3D SDS can have dimensions "time", "pressure" and "pressure".) If error, returns FAIL or tag/ref is not inserted. If OK, returns the total number of tag/refs in the vgroup (a +ve integer). - 28-MAR-91 Jason Ng NCSA. RETURNS diff --git a/hdf/test/egfhi.f b/hdf/test/egfhi.f index 3738440d01..b37d8d2ad2 100644 --- a/hdf/test/egfhi.f +++ b/hdf/test/egfhi.f @@ -15,7 +15,6 @@ C========================================================== c c HDF VSET Sample Program -c Jason NG NCSA FEB-28-92 c c EGFHI.F c Uses High-Level routines diff --git a/hdf/util/fp2hdf.c b/hdf/util/fp2hdf.c index b7ee927593..4e188650e0 100644 --- a/hdf/util/fp2hdf.c +++ b/hdf/util/fp2hdf.c @@ -143,26 +143,6 @@ * available by the National Center for Supercomputing Applications, * University of Illinois, Urbana-Champaign (ftp.ncsa.uiuc.edu). * - * History: - * Beta version: 17-May-89 - * (by Mike Folk mfolk@ncsa.uiuc.edu) - * Revision to put in the mean option: 15-Sep-89 - * (by Glen Mortensen gam@inel.gov) - * Officially released: 01-Dec-89 - * (by NCSA ftp.ncsa.uiuc.edu) - * Revision to fix some bugs: 16-Mar-90 - * (by Mike Folk mfolk@ncsa.uiuc.edu) - * Revision to support 3D and native fp input: 15-May-90 - * (by Bob Weaver baw@inel.gov) - * Revision to fix bug in interp() : 17-Oct-90 - * (by Fred Walsteijn nwalstyn@fys.ruu.n) - * Revision to fix bug in interp() : 23-Nov-90 - * Now it clips values outside of max and min. - * (by Fred Walsteijn nwalstyn@fys.ruu.n) - * Revision to start to use HDF 3.2 (and 3.3) library: 22-Jun-93 - * Still lots to do to support other number types. - * (by Chris Houck chouck@ncsa.uiuc.edu) - * */ #include "hdf.h" diff --git a/hdf/util/hdf24to8.c b/hdf/util/hdf24to8.c index b34929ce4d..21bb0bdbd1 100644 --- a/hdf/util/hdf24to8.c +++ b/hdf/util/hdf24to8.c @@ -31,9 +31,6 @@ * i.e. 8-bit image, dimensions, and * RGB palette. * - * by: NCSA - * date(s): May 89, Jun 89, Aug 89, May 90 - * ****************************************************************************/ typedef unsigned char UCHAR; diff --git a/mfhdf/hdfimport/hdfimport.c b/mfhdf/hdfimport/hdfimport.c index 2b99a3a6ce..0cdba747b6 100644 --- a/mfhdf/hdfimport/hdfimport.c +++ b/mfhdf/hdfimport/hdfimport.c @@ -168,34 +168,6 @@ * or native 16-bit integer values for IN16 input format or native 8-bit * integer values for IN08 input format. * - * Source Availability: - * This program is in the public domain, and was developed and made - * available by the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign (ftp.ncsa.uiuc.edu). - * - * History: - * Beta version: 17-May-89 - * (by Mike Folk mfolk@ncsa.uiuc.edu) - * Revision to put in the mean option: 15-Sep-89 - * (by Glen Mortensen gam@inel.gov) - * Officially released: 01-Dec-89 - * (by NCSA ftp.ncsa.uiuc.edu) - * Revision to fix some bugs: 16-Mar-90 - * (by Mike Folk mfolk@ncsa.uiuc.edu) - * Revision to support 3D and native fp input: 15-May-90 - * (by Bob Weaver baw@inel.gov) - * Revision to fix bug in interp() : 17-Oct-90 - * (by Fred Walsteijn nwalstyn@fys.ruu.n) - * Revision to fix bug in interp() : 23-Nov-90 - * Now it clips values outside of max and min. - * (by Fred Walsteijn nwalstyn@fys.ruu.n) - * Revision to start to use HDF 3.2 (and 3.3) library: 22-Jun-93 - * Still lots to do to support other number types. - * (by Chris Houck chouck@ncsa.uiuc.edu) - * Revision to incorporate 32-bit integer, 16-bit integer, 08-Jan-02 - * 8-bit integer data types and converting 64-bit - * input data to 64-bit output data. - * (by Pankaj Kamat pkamat@uiuc.edu) */ #include "hdf.h" diff --git a/mfhdf/hdiff/hdiff_dim.h b/mfhdf/hdiff/hdiff_dim.h index da837671f2..925eb411e0 100644 --- a/mfhdf/hdiff/hdiff_dim.h +++ b/mfhdf/hdiff/hdiff_dim.h @@ -1,14 +1,15 @@ -/**************************************************************************** - * NCSA HDF * - * Software Development Group * - * National Center for Supercomputing Applications * - * University of Illinois at Urbana-Champaign * - * 605 E. Springfield, Champaign IL 61820 * - * * - * For conditions of distribution and use, see the accompanying * - * hdf/COPYING file. * - * * - ****************************************************************************/ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * Copyright by the Board of Trustees of the University of Illinois. * + * All rights reserved. * + * * + * This file is part of HDF. The full HDF copyright notice, including * + * terms governing use, modification, and redistribution, is contained in * + * the COPYING file, which can be found at the root of the source code * + * distribution tree, or in https://support.hdfgroup.org/ftp/HDF/releases/. * + * If you do not have access to either file, you may request a copy from * + * help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #ifndef HDIFF_DIM_H #define HDIFF_DIM_H diff --git a/mfhdf/hdiff/hdiff_list.h b/mfhdf/hdiff/hdiff_list.h index df78ccc458..fd903e9ab6 100644 --- a/mfhdf/hdiff/hdiff_list.h +++ b/mfhdf/hdiff/hdiff_list.h @@ -1,14 +1,15 @@ -/**************************************************************************** - * NCSA HDF * - * Software Development Group * - * National Center for Supercomputing Applications * - * University of Illinois at Urbana-Champaign * - * 605 E. Springfield, Champaign IL 61820 * - * * - * For conditions of distribution and use, see the accompanying * - * hdf/COPYING file. * - * * - ****************************************************************************/ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * Copyright by the Board of Trustees of the University of Illinois. * + * All rights reserved. * + * * + * This file is part of HDF. The full HDF copyright notice, including * + * terms governing use, modification, and redistribution, is contained in * + * the COPYING file, which can be found at the root of the source code * + * distribution tree, or in https://support.hdfgroup.org/ftp/HDF/releases/. * + * If you do not have access to either file, you may request a copy from * + * help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #ifndef HDIFF_LIST_H #define HDIFF_LIST_H diff --git a/mfhdf/hdiff/hdiff_mattbl.h b/mfhdf/hdiff/hdiff_mattbl.h index 3eb00fe182..76181c1ef7 100644 --- a/mfhdf/hdiff/hdiff_mattbl.h +++ b/mfhdf/hdiff/hdiff_mattbl.h @@ -1,14 +1,15 @@ -/**************************************************************************** - * NCSA HDF * - * Software Development Group * - * National Center for Supercomputing Applications * - * University of Illinois at Urbana-Champaign * - * 605 E. Springfield, Champaign IL 61820 * - * * - * For conditions of distribution and use, see the accompanying * - * hdf/COPYING file. * - * * - ****************************************************************************/ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * Copyright by the Board of Trustees of the University of Illinois. * + * All rights reserved. * + * * + * This file is part of HDF. The full HDF copyright notice, including * + * terms governing use, modification, and redistribution, is contained in * + * the COPYING file, which can be found at the root of the source code * + * distribution tree, or in https://support.hdfgroup.org/ftp/HDF/releases/. * + * If you do not have access to either file, you may request a copy from * + * help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #ifndef HDIFF_MATTBL_H #define HDIFF_MATTBL_H diff --git a/mfhdf/hdiff/hdiff_table.h b/mfhdf/hdiff/hdiff_table.h index 2e4a99dbfd..6ebda3c686 100644 --- a/mfhdf/hdiff/hdiff_table.h +++ b/mfhdf/hdiff/hdiff_table.h @@ -1,14 +1,15 @@ -/**************************************************************************** - * NCSA HDF * - * Software Development Group * - * National Center for Supercomputing Applications * - * University of Illinois at Urbana-Champaign * - * 605 E. Springfield, Champaign IL 61820 * - * * - * For conditions of distribution and use, see the accompanying * - * hdf/COPYING file. * - * * - ****************************************************************************/ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * Copyright by the Board of Trustees of the University of Illinois. * + * All rights reserved. * + * * + * This file is part of HDF. The full HDF copyright notice, including * + * terms governing use, modification, and redistribution, is contained in * + * the COPYING file, which can be found at the root of the source code * + * distribution tree, or in https://support.hdfgroup.org/ftp/HDF/releases/. * + * If you do not have access to either file, you may request a copy from * + * help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #ifndef HDIFF_TABLE_H #define HDIFF_TABLE_H diff --git a/mfhdf/hrepack/hrepack_check.c b/mfhdf/hrepack/hrepack_check.c index 666d3f1d34..9dfb2409be 100644 --- a/mfhdf/hrepack/hrepack_check.c +++ b/mfhdf/hrepack/hrepack_check.c @@ -1,14 +1,15 @@ -/**************************************************************************** - * NCSA HDF * - * Software Development Group * - * National Center for Supercomputing Applications * - * University of Illinois at Urbana-Champaign * - * 605 E. Springfield, Champaign IL 61820 * - * * - * For conditions of distribution and use, see the accompanying * - * hdf/COPYING file. * - * * - ****************************************************************************/ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * Copyright by the Board of Trustees of the University of Illinois. * + * All rights reserved. * + * * + * This file is part of HDF. The full HDF copyright notice, including * + * terms governing use, modification, and redistribution, is contained in * + * the COPYING file, which can be found at the root of the source code * + * distribution tree, or in https://support.hdfgroup.org/ftp/HDF/releases/. * + * If you do not have access to either file, you may request a copy from * + * help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "hdf.h" #include "mfhdf.h" diff --git a/mfhdf/hrepack/hrepack_dim.h b/mfhdf/hrepack/hrepack_dim.h index 8dd9619373..7f25d6fac1 100644 --- a/mfhdf/hrepack/hrepack_dim.h +++ b/mfhdf/hrepack/hrepack_dim.h @@ -1,14 +1,15 @@ -/**************************************************************************** - * NCSA HDF * - * Software Development Group * - * National Center for Supercomputing Applications * - * University of Illinois at Urbana-Champaign * - * 605 E. Springfield, Champaign IL 61820 * - * * - * For conditions of distribution and use, see the accompanying * - * hdf/COPYING file. * - * * - ****************************************************************************/ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * Copyright by the Board of Trustees of the University of Illinois. * + * All rights reserved. * + * * + * This file is part of HDF. The full HDF copyright notice, including * + * terms governing use, modification, and redistribution, is contained in * + * the COPYING file, which can be found at the root of the source code * + * distribution tree, or in https://support.hdfgroup.org/ftp/HDF/releases/. * + * If you do not have access to either file, you may request a copy from * + * help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #ifndef HREPACK_DIM_H #define HREPACK_DIM_H diff --git a/mfhdf/hrepack/hrepack_vg.h b/mfhdf/hrepack/hrepack_vg.h index be4d29c414..6aaa50da02 100644 --- a/mfhdf/hrepack/hrepack_vg.h +++ b/mfhdf/hrepack/hrepack_vg.h @@ -1,14 +1,15 @@ -/**************************************************************************** - * NCSA HDF * - * Software Development Group * - * National Center for Supercomputing Applications * - * University of Illinois at Urbana-Champaign * - * 605 E. Springfield, Champaign IL 61820 * - * * - * For conditions of distribution and use, see the accompanying * - * hdf/COPYING file. * - * * - ****************************************************************************/ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * Copyright by the Board of Trustees of the University of Illinois. * + * All rights reserved. * + * * + * This file is part of HDF. The full HDF copyright notice, including * + * terms governing use, modification, and redistribution, is contained in * + * the COPYING file, which can be found at the root of the source code * + * distribution tree, or in https://support.hdfgroup.org/ftp/HDF/releases/. * + * If you do not have access to either file, you may request a copy from * + * help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #ifndef HREPACK_VG_H #define HREPACK_VG_H diff --git a/mfhdf/libsrc/nssdc.c b/mfhdf/libsrc/nssdc.c index e481c96bd5..c022fb2e8e 100644 --- a/mfhdf/libsrc/nssdc.c +++ b/mfhdf/libsrc/nssdc.c @@ -864,7 +864,7 @@ nssdc_write_cdf(XDR *xdrs, NC **handlep) #ifdef DEBUG fprintf(stderr, "We are sorry, we currently do not support writing to\n"); fprintf(stderr, "CDF files. If you would like to see this capabilities\n"); - fprintf(stderr, "please contact the HDF group at NCSA.\n"); + fprintf(stderr, "please contact the HDFG helpdesk: help at hdfgroup dot org.\n"); #endif return (FALSE);