Merge pull request #59 from thbeu/build-no-warnings

Add type casts for MSVC build w/o warnings
OSGeo · Nov 2, 2023 · c5c0f1a · c5c0f1a
2 parents 2cbfdc3 + 7038a24
commit c5c0f1a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/contrib/shpdxf.c b/contrib/shpdxf.c
@@ -283,7 +283,7 @@ int main(int argc, char **argv)
  char id[255];
 
  // Proceed to process data.
- for (int recNum = 0; (recNum < shp_numrec) && (recNum < MaxElem); recNum++)
+ for (int recNum = 0; (recNum < shp_numrec) && (recNum < (int)MaxElem); recNum++)
  {
  if (idfld >= 0)
  switch (idfld_type)

diff --git a/contrib/shpgeo.c b/contrib/shpgeo.c
@@ -80,7 +80,7 @@ char *asFileName(const char *fil, char *ext)
  /* -------------------------------------------------------------------- */
  char pszBasename[120];
  strcpy(pszBasename, fil);
- int i = strlen(pszBasename) - 1;
+ int i = (int)strlen(pszBasename) - 1;
  for (; i > 0 && pszBasename[i] != '.' && pszBasename[i] != '/' &&
  pszBasename[i] != '\\';
  i--)

diff --git a/dbfdump.c b/dbfdump.c
@@ -138,8 +138,9 @@ int main(int argc, char **argv)
  {
  const DBFFieldType eType =
  DBFGetFieldInfo(hDBF, i, szTitle, &nWidth, &nDecimals);
- if ((int)strlen(szTitle) > nWidth)
- panWidth[i] = strlen(szTitle);
+ const int titleLen = (int)strlen(szTitle);
+ if (titleLen > nWidth)
+ panWidth[i] = titleLen;
  else
  panWidth[i] = nWidth;
 

diff --git a/safileio.c b/safileio.c
@@ -124,7 +124,7 @@ void SASetupDefaultHooks(SAHooks *psHooks)
 
 static wchar_t *Utf8ToWideChar(const char *pszFilename)
 {
- const int nMulti = strlen(pszFilename) + 1;
+ const int nMulti = (int)strlen(pszFilename) + 1;
  const int nWide =
  MultiByteToWideChar(CP_UTF8, 0, pszFilename, nMulti, 0, 0);
  if (nWide == 0)