From 6bfc54ae0bfeb1eb2c5ad190ae44c76a741cc590 Mon Sep 17 00:00:00 2001 From: chad-iris Date: Fri, 6 Jan 2023 15:11:03 -0800 Subject: [PATCH] Mark as 2.7 release, rebrand to EarthScope --- ChangeLog | 2 +- README.md | 5 +++-- config.c | 4 ++-- doc/sl_addstream.3 | 7 ++++--- doc/sl_collect.3 | 7 ++++--- doc/sl_log.3 | 9 +++++---- doc/sl_msr_new.3 | 3 ++- doc/sl_newslcd.3 | 3 ++- doc/sl_packettype.3 | 2 +- doc/sl_ping.3 | 4 ++-- doc/sl_read_streamlist.3 | 2 +- doc/sl_request_info.3 | 2 +- doc/sl_savestate.3 | 2 +- doc/sl_utils.3 | 5 +++-- genutils.c | 4 ++-- gswap.c | 4 ++-- libslink.h | 6 +++--- logging.c | 4 ++-- mseedformat.h | 5 +++-- msrecord.c | 4 ++-- network.c | 4 ++-- slplatform.c | 4 ++-- slplatform.h | 4 ++-- slutils.c | 4 ++-- statefile.c | 4 ++-- strutils.c | 4 ++-- unpack.c | 4 ++-- unpack.h | 4 ++-- 28 files changed, 62 insertions(+), 54 deletions(-) diff --git a/ChangeLog b/ChangeLog index c72f840..318e9d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2022.074: version 2.7RC +2022.074: version 2.7 - Add buffer scanning limit fix from andrei.akimov@berkeley.edu. 2020.048: diff --git a/README.md b/README.md index 19ad40c..4b4e4cf 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -Copyright (C) 2020 Chad Trabant, IRIS Data Management Center +Copyright (C) 2022 Chad Trabant, EarthScope Data Services ## Acknowlegements -- @@ -53,4 +53,5 @@ patches submitted by others. Individual acknowlegements are included in the ChangeLog. Thank you! Initial development at the ORFEUS Data Center/EC MEREDIAN Project -Continuing maintenance at the IRIS Data Management Center +Continuing maintenance at the IRIS Data Management Center, now +EarthScope Data Services. diff --git a/config.c b/config.c index e7e1b5a..451a2e8 100644 --- a/config.c +++ b/config.c @@ -18,8 +18,8 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * Copyright (C) 2020: - * @author Chad Trabant, IRIS Data Management Center + * Copyright (C) 2022: + * @author Chad Trabant, EarthScope Data Services ***************************************************************************/ #include diff --git a/doc/sl_addstream.3 b/doc/sl_addstream.3 index d056461..38685c6 100644 --- a/doc/sl_addstream.3 +++ b/doc/sl_addstream.3 @@ -37,10 +37,10 @@ On success these functions return 0, on error -1. .SH EXAMPLE .nf #include - + main () { SLCD * slconn; - + ... sl_addstream (slconn, "GE", "APE", 0, -1, 0); @@ -68,5 +68,6 @@ for each stream entry with these functions it is much easier to use .nf Chad Trabant Developed while at ORFEUS Data Center/EC-Project MEREDIAN -Currently at IRIS Data Management Center +Then at IRIS Data Managment Center +Currently at EarthScope Data Services .fi diff --git a/doc/sl_collect.3 b/doc/sl_collect.3 index 1650c5b..db13830 100644 --- a/doc/sl_collect.3 +++ b/doc/sl_collect.3 @@ -17,11 +17,11 @@ sl_collect, sl_terminate \- SeedLink connection management Using the parameters in a SeedLink Connection Description (SLCD) \fBsl_collect\fP will persistantly maintain a connection to SeedLink server. Designed to run in a tight loop at the heart of a client -program, this function blocks until a packet is received. When a +program, this function blocks until a packet is received. When a packet is received \fIslpack\fP is set to the packet address and a positive integer is returned. Based on the \fIkeepalive\fP, \fInetto\fP and \fInetdly\fP parameters in the SLCD, the function will -send keep alive packets and reconnect when necessary. When the +send keep alive packets and reconnect when necessary. When the \fIterminate\fP flag is set in the SLCD \fBsl_collect\fP will close the network connection, finish passing received packets to the calling program and finally return NULL when the buffer is empty. @@ -132,5 +132,6 @@ shutdown the client using \fBsl_terminate\fP. .nf Chad Trabant Developed while at ORFEUS Data Center/EC-Project MEREDIAN -Currently at IRIS Data Management Center +Then at IRIS Data Managment Center +Currently at EarthScope Data Services .fi diff --git a/doc/sl_log.3 b/doc/sl_log.3 index 852760e..992d867 100644 --- a/doc/sl_log.3 +++ b/doc/sl_log.3 @@ -115,11 +115,11 @@ A simple example of setting the default verbosity: .nf #include - + main () { int verbosity; - ... get desired verbosity from command line, etc. + ... get desired verbosity from command line, etc. sl_loginit (verbose, NULL, NULL, NULL, NULL); @@ -145,7 +145,7 @@ void diag_print (const char *message); main () { int verbosity; - ... get desired verbosity from command line, etc. + ... get desired verbosity from command line, etc. sl_loginit (verbose, &log_print, "LOG: ", &diag_print, "ERR: "); @@ -174,5 +174,6 @@ void diag_print (const char *message) { .nf Chad Trabant Developed while at ORFEUS Data Center/EC-Project MEREDIAN -Currently at IRIS Data Management Center +Then at IRIS Data Managment Center +Currently at EarthScope Data Services .fi diff --git a/doc/sl_msr_new.3 b/doc/sl_msr_new.3 index 5acaf59..3cba62f 100644 --- a/doc/sl_msr_new.3 +++ b/doc/sl_msr_new.3 @@ -148,5 +148,6 @@ resulting in well behaved C strings. .nf Chad Trabant Developed while at ORFEUS Data Center/EC-Project MEREDIAN -Currently at IRIS Data Management Center +Then at IRIS Data Managment Center +Currently at EarthScope Data Services .fi diff --git a/doc/sl_newslcd.3 b/doc/sl_newslcd.3 index a36b894..9c9e944 100644 --- a/doc/sl_newslcd.3 +++ b/doc/sl_newslcd.3 @@ -89,5 +89,6 @@ the system anyway. .nf Chad Trabant Developed while at ORFEUS Data Center/EC-Project MEREDIAN -Currently at IRIS Data Management Center +Then at IRIS Data Managment Center +Currently at EarthScope Data Services .fi diff --git a/doc/sl_packettype.3 b/doc/sl_packettype.3 index a69d62a..05000e4 100644 --- a/doc/sl_packettype.3 +++ b/doc/sl_packettype.3 @@ -50,5 +50,5 @@ the \fBsl_collect\fP family of functions. .nf Chad Trabant Developed while at ORFEUS Data Center/EC-Project MEREDIAN -Currently at IRIS Data Management Center +Currently at EarthScope Data Services .fi diff --git a/doc/sl_ping.3 b/doc/sl_ping.3 index 71d05cb..ea6bb3d 100644 --- a/doc/sl_ping.3 +++ b/doc/sl_ping.3 @@ -6,7 +6,7 @@ sl_ping \- Test the existence of a SeedLink server .SH SYNOPSIS .nf .B #include -.sp +.sp .BI "int \fBsl_ping\fP (SLCD * " slconn ", char *" serverid ", char *" site "); .fi .SH DESCRIPTION @@ -23,5 +23,5 @@ when the socket conneciton could not be opened. .SH AUTHOR .nf Chad Trabant -IRIS Data Management Center +EarthScope Data Services .fi diff --git a/doc/sl_read_streamlist.3 b/doc/sl_read_streamlist.3 index eea57ba..5985d1a 100644 --- a/doc/sl_read_streamlist.3 +++ b/doc/sl_read_streamlist.3 @@ -61,5 +61,5 @@ chain or -1 on error. .nf Chad Trabant Developed while at ORFEUS Data Center/EC-Project MEREDIAN -Currently at IRIS Data Management Center +Currently at EarthScope Data Services .fi diff --git a/doc/sl_request_info.3 b/doc/sl_request_info.3 index c16bbf0..739dfb3 100644 --- a/doc/sl_request_info.3 +++ b/doc/sl_request_info.3 @@ -36,5 +36,5 @@ See \fBsl_collect\fP(3) for an example. .nf Chad Trabant Developed while at ORFEUS Data Center/EC-Project MEREDIAN -Currently at IRIS Data Management Center +Currently at EarthScope Data Services .fi diff --git a/doc/sl_savestate.3 b/doc/sl_savestate.3 index f76a5f1..7a3c96d 100644 --- a/doc/sl_savestate.3 +++ b/doc/sl_savestate.3 @@ -46,5 +46,5 @@ saving of state information. .nf Chad Trabant Developed while at ORFEUS Data Center/EC-Project MEREDIAN -Currently at IRIS Data Management Center +Currently at EarthScope Data Services .fi diff --git a/doc/sl_utils.3 b/doc/sl_utils.3 index b0fd6e3..991b143 100644 --- a/doc/sl_utils.3 +++ b/doc/sl_utils.3 @@ -13,7 +13,7 @@ sl_strncpclean \- Copy a string while removing space characters .SH SYNOPSIS .nf .B #include -.sp +.sp .BI "double \fBsl_dtime\fP (void); .sp .BI "int \fBsl_doy2md\fP (int " year ", int " jday ", int *" month ", int *" mday "); @@ -54,5 +54,6 @@ the null terminator) copied to the destination string. .nf Chad Trabant Developed while at ORFEUS Data Center/EC-Project MEREDIAN -Currently at IRIS Data Management Center +Then at IRIS Data Managment Center +Currently at EarthScope Data Services .fi diff --git a/genutils.c b/genutils.c index 2ef2c54..06fb118 100644 --- a/genutils.c +++ b/genutils.c @@ -16,8 +16,8 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * Copyright (C) 2020: - * @author Chad Trabant, IRIS Data Management Center + * Copyright (C) 2022: + * @author Chad Trabant, EarthScope Data Services ***************************************************************************/ #include diff --git a/gswap.c b/gswap.c index ce61769..5e2cbc6 100644 --- a/gswap.c +++ b/gswap.c @@ -29,8 +29,8 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * Copyright (C) 2020: - * @author Chad Trabant, IRIS Data Management Center + * Copyright (C) 2022: + * @author Chad Trabant, EarthScope Data Services ***************************************************************************/ #include diff --git a/libslink.h b/libslink.h index 913a133..8ec34b4 100644 --- a/libslink.h +++ b/libslink.h @@ -17,8 +17,8 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * Copyright (C) 2020: - * @author Chad Trabant, IRIS Data Management Center + * Copyright (C) 2022: + * @author Chad Trabant, EarthScope Data Services ***************************************************************************/ #ifndef LIBSLINK_H @@ -28,7 +28,7 @@ extern "C" { #endif -#define LIBSLINK_VERSION "2.7.0RC" /**< libslink version */ +#define LIBSLINK_VERSION "2.7.0" /**< libslink version */ #define LIBSLINK_RELEASE "2022.074" /**< libslink release date */ /** @defgroup seedlink-connection SeedLink Connection */ diff --git a/logging.c b/logging.c index ca5f032..7d2e3ab 100644 --- a/logging.c +++ b/logging.c @@ -17,8 +17,8 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * Copyright (C) 2020: - * @author Chad Trabant, IRIS Data Management Center + * Copyright (C) 2022: + * @author Chad Trabant, EarthScope Data Services ***************************************************************************/ #include diff --git a/mseedformat.h b/mseedformat.h index f14afce..88240ec 100644 --- a/mseedformat.h +++ b/mseedformat.h @@ -3,8 +3,6 @@ * * This file is part of the libslink Library. * - * Copyright (c) 2020 Chad Trabant, IRIS Data Management Center - * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,6 +14,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * Copyright (c) 2022 + * @author Chad Trabant, EarthScope Data Services ***************************************************************************/ #ifndef MSEEDFORMAT_H diff --git a/msrecord.c b/msrecord.c index b7f1f0a..db32db9 100644 --- a/msrecord.c +++ b/msrecord.c @@ -24,8 +24,8 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * Copyright (C) 2020: - * @author Chad Trabant, IRIS Data Management Center + * Copyright (C) 2022: + * @author Chad Trabant, EarthScope Data Services ***************************************************************************/ #include diff --git a/network.c b/network.c index 3c9f07a..3cc66b5 100644 --- a/network.c +++ b/network.c @@ -20,8 +20,8 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * Copyright (C) 2020: - * @author Chad Trabant, IRIS Data Management Center + * Copyright (C) 2022: + * @author Chad Trabant, EarthScope Data Services ***************************************************************************/ #include diff --git a/slplatform.c b/slplatform.c index 807fded..bd9a7a6 100644 --- a/slplatform.c +++ b/slplatform.c @@ -17,8 +17,8 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * Copyright (C) 2020: - * @author Chad Trabant, IRIS Data Management Center + * Copyright (C) 2022: + * @author Chad Trabant, EarthScope Data Services ***************************************************************************/ #include diff --git a/slplatform.h b/slplatform.h index 0a47cfd..f32d31b 100644 --- a/slplatform.h +++ b/slplatform.h @@ -18,8 +18,8 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * Copyright (C) 2020: - * @author Chad Trabant, IRIS Data Management Center + * Copyright (C) 2022: + * @author Chad Trabant, EarthScope Data Services ***************************************************************************/ #ifndef SLPLATFORM_H diff --git a/slutils.c b/slutils.c index 98dea4e..4bf11e5 100644 --- a/slutils.c +++ b/slutils.c @@ -17,8 +17,8 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * Copyright (C) 2020: - * @author Chad Trabant, IRIS Data Management Center + * Copyright (C) 2022: + * @author Chad Trabant, EarthScope Data Services ***************************************************************************/ #include diff --git a/statefile.c b/statefile.c index 859c409..e60b180 100644 --- a/statefile.c +++ b/statefile.c @@ -17,8 +17,8 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * Copyright (C) 2020: - * @author Chad Trabant, IRIS Data Management Center + * Copyright (C) 2022: + * @author Chad Trabant, EarthScope Data Services ***************************************************************************/ #include diff --git a/strutils.c b/strutils.c index 11bd047..966b09c 100644 --- a/strutils.c +++ b/strutils.c @@ -17,8 +17,8 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * Copyright (C) 2020: - * @author Chad Trabant, IRIS Data Management Center + * Copyright (C) 2022: + * @author Chad Trabant, EarthScope Data Services ***************************************************************************/ #include diff --git a/unpack.c b/unpack.c index 600e396..8622443 100644 --- a/unpack.c +++ b/unpack.c @@ -18,8 +18,8 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * Copyright (C) 2020: - * @author Chad Trabant, IRIS Data Management Center + * Copyright (C) 2022: + * @author Chad Trabant, EarthScope Data Services ************************************************************************/ #include diff --git a/unpack.h b/unpack.h index 3ebf955..5c9fd7c 100644 --- a/unpack.h +++ b/unpack.h @@ -17,8 +17,8 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * Copyright (C) 2020: - * @author Chad Trabant, IRIS Data Management Center + * Copyright (C) 2022: + * @author Chad Trabant, EarthScope Data Services ***************************************************************************/