Merge pull request #1349 from dwcaress/caress-tmp

Catch master up to caress-tmp in preparation for 5.7.9beta50.

ChangeLog.md

@@ -23,7 +23,7 @@ Distributions that do not include "beta" in the tag name correspond to the major
 announced releases. The source distributions associated with all releases, major
 or beta, are equally accessible as tarballs through the Github interface.
 
-- Version 5.7.9beta50    January 28, 2023
+- Version 5.7.9beta50    February 12, 2023
 - Version 5.7.9beta49    January 22, 2023
 - Version 5.7.9beta48    December 16, 2022
 - Version 5.7.9beta47    November 15, 2022
@@ -427,14 +427,25 @@ or beta, are equally accessible as tarballs through the Github interface.
 ### MB-System Version 5.7 Release Notes:
 --
 
-#### 5.7.9beta50 (January 28, 2023)
+#### 5.7.9beta50 (February 12, 2023)
+
+General: Changed many sprintf() calls to snprintf() calls. 
+
+General: Fixed many compiler warnings having to do with unused variables, unitialized 
+variables, and possible string overflows.
 
 MBnavadjust: Fixed interface issues for importing multiple reference grids and
 selecting those while makeing global ties.
 
 Format 261 (MBF_KEMKMALL): Added code to detect and handle gracefully some 
 instances of corruption of MRZ datagrams, particularly due to missing bytes.
 
+Format 201 (MBF_HYSWEEP1): Fixed reading of Hysweep multibeam in which beam angles are
+stored in spherical coordinates but are not corrected for roll and pitch. Updated 
+support to handle multibeam data with angles in spherical coordinates that have not
+been corrected for roll and pitch, and to be consistent with the most recent Hypack
+users manual released February 2023.
+
 #### 5.7.9beta49 (January 22, 2023)
 
 Mbm_grdplot, mbm_grd3dplot, mbm_histplot, mbm_plot, mbm_xyplot: Made evince one

configure

@@ -3293,7 +3293,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-printf "%s\n" "#define VERSION_DATE \"28 January 2023\"" >>confdefs.h
+printf "%s\n" "#define VERSION_DATE \"12 February 2023\"" >>confdefs.h
 
 
 printf "%s\n" " "

configure.ac

@@ -12,7 +12,7 @@ dnl--------------------------------------------------------------------
 
 dnl Initialize and set version and version date
 AC_INIT([mbsystem],[5.7.9beta50],[http://listserver.mbari.org/sympa/arc/mbsystem],[mbsystem],[http://www.mbari.org/data/mbsystem/])
-AC_DEFINE(VERSION_DATE, ["28 January 2023"], [Set VERSION_DATE define in mb_config.h])
+AC_DEFINE(VERSION_DATE, ["12 February 2023"], [Set VERSION_DATE define in mb_config.h])
 
 AS_ECHO([" "])
 AS_ECHO(["------------------------------------------------------------------------------"])

src/deprecated/mbswplspreprocess.cc

@@ -68,8 +68,6 @@
 #include "mb_status.h"
 #include "mbsys_swathplus.h"
 
-constexpr int MAX_ERROR_STRING = 1024;
-
 typedef struct mbdefaults_struct {
 	int verbose;
 	int format;
@@ -610,7 +608,7 @@ static int remove_rejected_samps(int verbose, swpls_sxpping *ping, int *error) {
 	swpls_point *points;
 	int status = mb_mallocd(verbose, __FILE__, __LINE__, valid * sizeof(swpls_point), (void **)&points, error);
 	if (status != MB_SUCCESS) {
-		char message[MAX_ERROR_STRING] = {0};
+		mb_path message = {0};
 		snprintf(message, sizeof(message), "Failure to allocate memory for temporary array (%lu bytes)", valid * sizeof(swpls_point));
 		error_exit(verbose, *error, "mb_mallocd", message);
 	}
@@ -645,7 +643,7 @@ static int remove_rejected_samps(int verbose, swpls_sxpping *ping, int *error) {
 } /* remove_rejected_samps */
 
 /*----------------------------------------------------------------------*/
-static int set_outfile_names(int verbose, mb_path *ofile, mb_path ifile, mb_path *basename, bool ofile_set, bool split_txers,
+static int set_outfile_names(int verbose, mb_pathplus *ofile, mb_path ifile, mb_path *basename, bool ofile_set, bool split_txers,
                              int *error) {
 	if (verbose >= 2) {
 		fprintf(stderr, "\ndbg2  function <%s> called\n", __func__);
@@ -815,14 +813,14 @@ static int process_output(int verbose, mbdefaults *mbdflts, options *opts, mb_pa
 	int beams_bath_alloc;
 	int beams_amp_alloc;
 	int pixels_ss_alloc;
-	mb_path ofile[SWPLS_MAX_TXERS];
+	mb_pathplus ofile[SWPLS_MAX_TXERS];
 	struct mbsys_swathplus_struct *istore = nullptr;
 
 	/* open the input file */
 	if (mb_read_init(opts->verbose, ifile, opts->format, mbdflts->pings_get, mbdflts->lonflip, mbdflts->bounds,
 	                           mbdflts->btime_i, mbdflts->etime_i, mbdflts->speedmin, mbdflts->timegap, &imbio_ptr, &btime_d,
 	                           &etime_d, &beams_bath_alloc, &beams_amp_alloc, &pixels_ss_alloc, error) != MB_SUCCESS) {
-		char message[MAX_ERROR_STRING] = {0};
+		mb_pathplus message = "";
 		snprintf(message, sizeof(message), "Swath File <%s> not initialized for reading\n", ifile);
 		error_exit(opts->verbose, *error, "mb_read_init", message);
 	}
@@ -903,7 +901,7 @@ static int process_output(int verbose, mbdefaults *mbdflts, options *opts, mb_pa
 					status = mb_write_init(opts->verbose, ofile[txidx], opts->format, &ombio_ptr[txidx], &obeams_bath,
 					                       &obeams_amp, &opixels_ss, error);
 					if (status != MB_SUCCESS) {
-						char message[MAX_ERROR_STRING+50] = {0};
+						char message[MB_PATHPLUS_MAXLINE] = {0};
 						snprintf(message, sizeof(message), "SWATHplus file <%s> not initialized for writing.\n", ofile[txidx]);
 						error_exit(verbose, *error, "mb_write_init", message);
 					}
@@ -932,7 +930,7 @@ static int process_output(int verbose, mbdefaults *mbdflts, options *opts, mb_pa
 
 				/* check for error writing here */
 				if (status != MB_SUCCESS) {
-					char message[MAX_ERROR_STRING+50] = {0};
+					char message[MB_PATHPLUS_MAXLINE] = {0};
 					snprintf(message, sizeof(message), "Data not written to file <%s>\n", ofile[txidx]);
 					error_exit(opts->verbose, *error, "mb_write_ping", message);
 				}
@@ -1168,7 +1166,7 @@ int main(int argc, char **argv) {
 	if (read_datalist) {
 		const int look_processed = MB_DATALIST_LOOK_UNSET;
 		if (mb_datalist_open(opts.verbose, &datalist, opts.read_file, look_processed, &error) != MB_SUCCESS) {
-			char message[MAX_ERROR_STRING+50];
+			mb_pathplus message;
 			snprintf(message, sizeof(message), "Unable to open data list file: %s\n", opts.read_file);
 			error_exit(opts.verbose, MB_ERROR_OPEN_FAIL, "mb_datalist_open", message);
 		}