mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

stop silly warnings

Browse source 
These both created warnings about potential truncation that in an of themselves
were already bogus, but were turned into errors by zealous distro compiler
defaults.
The new code is annoying and marginally pointless, but... alas.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2024-04-24 17:17:14 -07:00
parent 9deef235e2
commit 2219f66f67
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
core/uemis-downloader.cpp
View file

@ -285,10 +285,12 @@ static char *build_filename(const char *path, const char *name)
int len = strlen(path) + strlen(name) + 2; int len = strlen(path) + strlen(name) + 2;
char *buf = (char *)malloc(len); char *buf = (char *)malloc(len);
#if WIN32 #if WIN32
snprintf(buf, len, "%s\\%s", path, name); l = snprintf(buf, len, "%s\\%s", path, name);
#else #else
snprintf(buf, len, "%s/%s", path, name); l = snprintf(buf, len, "%s/%s", path, name);
#endif #endif
if(l < 0 or l > len)
printf("this compiler is broken -- snprintf returned %d\n", l);
return buf; return buf;
} }
@ -517,14 +519,10 @@ static void uemis_increased_timeout(int *timeout)
static char *build_ans_path(const char *path, int filenumber) static char *build_ans_path(const char *path, int filenumber)
{ {
char *intermediate, *ans_path, fl[13]; char *intermediate, *ans_path, fl[15];
/* Clamp filenumber into the 0..9999 range. This is never necessary, uint16_t fn = (filenumber < 0 || filenumber > UEMIS_MAX_FILES) ? 0 : filenumber;
* as filenumber can never go above UEMIS_MAX_FILES, but gcc doesn't snprintf(fl, 15, "ANS%u.TXT", fn);
* recognize that and produces very noisy warnings. */
filenumber = filenumber < 0 ? 0 : filenumber % 10000;
snprintf(fl, 13, "ANS%d.TXT", filenumber);
intermediate = build_filename(path, "ANS"); intermediate = build_filename(path, "ANS");
ans_path = build_filename(intermediate, fl); ans_path = build_filename(intermediate, fl);
free(intermediate); free(intermediate);