Skip to content

Commit 2da5c16

Browse files
committed
* Fix size of names for fitting snprintf
1 parent be95bf7 commit 2da5c16

File tree

3 files changed

+20
-17
lines changed

3 files changed

+20
-17
lines changed

configure

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4369,14 +4369,14 @@ fi
43694369
##################
43704370
## SZIP
43714371
##################
4372-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SZ_BufftoBuffCompress in -lsz" >&5
4373-
printf %s "checking for SZ_BufftoBuffCompress in -lsz... " >&6; }
4374-
if test ${ac_cv_lib_sz_SZ_BufftoBuffCompress+y}
4372+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SZ_BufftoBuffCompress in -laec" >&5
4373+
printf %s "checking for SZ_BufftoBuffCompress in -laec... " >&6; }
4374+
if test ${ac_cv_lib_aec_SZ_BufftoBuffCompress+y}
43754375
then :
43764376
printf %s "(cached) " >&6
43774377
else $as_nop
43784378
ac_check_lib_save_LIBS=$LIBS
4379-
LIBS="-lsz $LIBS"
4379+
LIBS="-laec $LIBS"
43804380
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
43814381
/* end confdefs.h. */
43824382
@@ -4400,26 +4400,29 @@ return SZ_BufftoBuffCompress ();
44004400
_ACEOF
44014401
if ac_fn_c_try_link "$LINENO"
44024402
then :
4403-
ac_cv_lib_sz_SZ_BufftoBuffCompress=yes
4403+
ac_cv_lib_aec_SZ_BufftoBuffCompress=yes
44044404
else $as_nop
4405-
ac_cv_lib_sz_SZ_BufftoBuffCompress=no
4405+
ac_cv_lib_aec_SZ_BufftoBuffCompress=no
44064406
fi
44074407
rm -f core conftest.err conftest.$ac_objext conftest.beam \
44084408
conftest$ac_exeext conftest.$ac_ext
44094409
LIBS=$ac_check_lib_save_LIBS
44104410
fi
4411-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sz_SZ_BufftoBuffCompress" >&5
4412-
printf "%s\n" "$ac_cv_lib_sz_SZ_BufftoBuffCompress" >&6; }
4413-
if test "x$ac_cv_lib_sz_SZ_BufftoBuffCompress" = xyes
4411+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aec_SZ_BufftoBuffCompress" >&5
4412+
printf "%s\n" "$ac_cv_lib_aec_SZ_BufftoBuffCompress" >&6; }
4413+
if test "x$ac_cv_lib_aec_SZ_BufftoBuffCompress" = xyes
44144414
then :
44154415
HAVE_LIBSZ="yes"
4416+
4417+
printf "%s\n" "#define HAVE_LIBSZ 1" >>confdefs.h
4418+
44164419
else $as_nop
4417-
as_fn_error $? "could not find szip:
4418-
Debian: sudo apt install libsz2
4419-
RPM-based: sudo dnf install szip
4420-
MacOS: brew install szip" "$LINENO" 5
4420+
as_fn_error $? "could not find SZIP (libaec):
4421+
Debian/Ubuntu: sudo apt install libaec-dev
4422+
RPM-based: sudo dnf install libaec-devel
4423+
macOS: brew install libaec" "$LINENO" 5
44214424
fi
4422-
4425+
gediRat.c:207
44234426

44244427

44254428

src/gedisimulator/gediRat.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
typedef struct
77
{
88
char **inList;
9-
char outNamen[1000];
10-
char waveNamen[400];
9+
char outNamen[400];
10+
char waveNamen[1000];
1111

1212
/*IO structure*/
1313
gediIOstruct gediIO; /*generic IO options*/

src/libclidar/libLidarHDF.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ lvisHDF *readLVIShdf(char *inNamen)
343343
lvisHDF *lvis=NULL;
344344
int checkNumber(int,int,char *);
345345
hid_t file; /* Handles */
346-
char varName[10]; /*name for variable bin HDF5 files*/
346+
char varName[15]; /*name for variable bin HDF5 files*/
347347

348348

349349
/*allocate structure*/

0 commit comments

Comments
 (0)