Remove new lines from error messages and typo fixes

Fixes #14174

Author: geographika

apps/gdalwarp_bin.cpp

@@ -133,7 +133,7 @@ MAIN_START(argc, argv)
         sOptionsForBinary.bOverwrite)
     {
         CPLError(CE_Failure, CPLE_IllegalArg,
-                 "Source and destination datasets must be different.\n");
+                 "Source and destination datasets must be different.");
         GDALExit(1);
     }
 

apps/nearblack_lib.cpp

@@ -282,7 +282,7 @@ GDALDatasetH CPL_DLL GDALNearblack(const char *pszDest, GDALDatasetH hDstDS,
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "-color args must have the same number of values as "
-                 "the non alpha input band count.\n");
+                 "the non alpha input band count.");
         if (bCloseOutDSOnError)
             GDALClose(hDstDS);
         return nullptr;

autotest/gdrivers/derived.py

@@ -142,7 +142,7 @@ def test_derived_test3():
         gdal.Open("DERIVED_SUBDATASET:LOGAMPLITUDE:dataset_does_not_exist")
 
     with pytest.raises(Exception):
-        # Raster with zero band
+        # Raster with zero bands
         gdal.Open("DERIVED_SUBDATASET:LOGAMPLITUDE:data/hdf5/CSK_DGM.h5")
 
 

frmts/bsb/bsbdataset.cpp

@@ -919,7 +919,7 @@ static int BSBIsSRSOK(const char *pszWKT)
     if (!bOK)
     {
         CPLError(CE_Warning, CPLE_NotSupported,
-                 "BSB only supports WGS84 or NAD83 geographic projections.\n");
+                 "BSB only supports WGS84 or NAD83 geographic projections.");
     }
 
     return bOK;
@@ -942,7 +942,7 @@ static GDALDataset *BSBCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
     if (nBands != 1)
     {
         CPLError(CE_Failure, CPLE_NotSupported,
-                 "BSB driver only supports one band images.\n");
+                 "BSB driver only supports one band images.");
 
         return NULL;
     }

frmts/cosar/cosar_dataset.cpp

@@ -101,7 +101,7 @@ CPLErr COSARRasterBand::IReadBlock(int /*nBlockXOff*/, int nBlockYOff,
     {
         /* throw an error */
         CPLError(CE_Failure, CPLE_AppDefined,
-                 "RSLV/RSFV values are not sane... oh dear.\n");
+                 "RSLV/RSFV values are not sane... oh dear.");
         return CE_Failure;
     }
 

frmts/dted/dteddataset.cpp

@@ -672,14 +672,14 @@ static GDALDataset *DTEDCreateCopy(const char *pszFilename,
     {
         CPLError(
             CE_Failure, CPLE_NotSupported,
-            "DTED driver does not support source dataset with zero band.\n");
+            "DTED driver does not support source datasets with zero bands.");
         return nullptr;
     }
 
     if (nBands != 1)
     {
         CPLError((bStrict) ? CE_Failure : CE_Warning, CPLE_NotSupported,
-                 "DTED driver only uses the first band of the dataset.\n");
+                 "DTED driver only uses the first band of the dataset.");
         if (bStrict)
             return nullptr;
     }

frmts/ecw/ecwcreatecopy.cpp

@@ -722,7 +722,7 @@ CPLErr GDALECWCompressor::Initialize(
     if (gt.xrot != 0.0 || gt.yrot != 0.0)
         CPLError(CE_Warning, CPLE_NotSupported,
                  "Rotational coefficients ignored, georeferencing of\n"
-                 "output ECW file will be incorrect.\n");
+                 "output ECW file will be incorrect.");
     else
     {
         psClient->fOriginX = gt.xorig;
@@ -1102,7 +1102,7 @@ static GDALDataset *ECWCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
     {
         CPLError(
             CE_Failure, CPLE_NotSupported,
-            "ECW driver does not support source dataset with zero band.\n");
+            "ECW driver does not support source datasets with zero bands.");
         return nullptr;
     }
 
@@ -1163,7 +1163,7 @@ static GDALDataset *ECWCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
                          "ECW version 2 does not support UInt16 data type, "
                          "truncating to Byte."
                          " Consider specifying ECW_FORMAT_VERSION=3 for full "
-                         "UInt16 support available in ECW version 3. \n");
+                         "UInt16 support available in ECW version 3. ");
             }
             else
 #endif
@@ -1299,7 +1299,7 @@ GDALDataset *ECWCreateCopyECW(const char *pszFilename, GDALDataset *poSrcDS,
     {
         CPLError(
             CE_Failure, CPLE_NotSupported,
-            "ECW driver does not support source dataset with zero band.\n");
+            "ECW driver does not support source datasets with zero bands.");
         return nullptr;
     }
 
@@ -1335,7 +1335,7 @@ GDALDataset *ECWCreateCopyECW(const char *pszFilename, GDALDataset *poSrcDS,
             CPLError(CE_Failure, CPLE_NotSupported,
                      "ECW v2 does not support UInt16 data type. Consider "
                      " specifying ECW_FORMAT_VERSION=3 for full UInt16 support "
-                     "available in ECW v3. \n");
+                     "available in ECW v3. ");
         }
         else
 #endif
@@ -1369,7 +1369,7 @@ GDALDataset *ECWCreateCopyECW(const char *pszFilename, GDALDataset *poSrcDS,
                  "ECW driver ignores color table. "
                  "The source raster band will be considered as grey level.\n"
                  "Consider using color table expansion (-expand option in "
-                 "gdal_translate)\n");
+                 "gdal_translate)");
         if (bStrict)
             return nullptr;
     }
@@ -1394,7 +1394,7 @@ GDALDataset *ECWCreateCopyJPEG2000(const char *pszFilename,
     {
         CPLError(
             CE_Failure, CPLE_NotSupported,
-            "JP2ECW driver does not support source dataset with zero band.\n");
+            "JP2ECW driver does not support source datasets with zero bands.");
         return nullptr;
     }
 
@@ -1428,7 +1428,7 @@ GDALDataset *ECWCreateCopyJPEG2000(const char *pszFilename,
                  "JP2ECW driver ignores color table. "
                  "The source raster band will be considered as grey level.\n"
                  "Consider using color table expansion (-expand option in "
-                 "gdal_translate)\n");
+                 "gdal_translate)");
         if (bStrict)
             return nullptr;
     }

frmts/georaster/georaster_dataset.cpp

@@ -1493,7 +1493,7 @@ GDALDataset *GeoRasterDataset::CreateCopy(const char *pszFilename,
     {
         CPLError(CE_Failure, CPLE_NotSupported,
                  "GeoRaster driver does not support source dataset with zero "
-                 "band.\n");
+                 "band.");
         return nullptr;
     }
 

frmts/georaster/oci_wrapper.cpp

@@ -1896,19 +1896,19 @@ bool CheckError(sword nStatus, OCIError *hError)
             return false;
             break;
         case OCI_NEED_DATA:
-            CPLError(CE_Failure, CPLE_AppDefined, "OCI_NEED_DATA\n");
+            CPLError(CE_Failure, CPLE_AppDefined, "OCI_NEED_DATA");
             break;
         case OCI_NO_DATA:
-            CPLError(CE_Failure, CPLE_AppDefined, "OCI_NODATA\n");
+            CPLError(CE_Failure, CPLE_AppDefined, "OCI_NODATA");
             break;
         case OCI_INVALID_HANDLE:
             CPLError(CE_Failure, CPLE_AppDefined, "OCI_INVALID_HANDLE");
             break;
         case OCI_STILL_EXECUTING:
-            CPLError(CE_Failure, CPLE_AppDefined, "OCI_STILL_EXECUTE\n");
+            CPLError(CE_Failure, CPLE_AppDefined, "OCI_STILL_EXECUTE");
             break;
         case OCI_CONTINUE:
-            CPLError(CE_Failure, CPLE_AppDefined, "OCI_CONTINUE\n");
+            CPLError(CE_Failure, CPLE_AppDefined, "OCI_CONTINUE");
             break;
         case OCI_ERROR:
 

frmts/gif/biggifdataset.cpp

@@ -240,7 +240,7 @@ CPLErr BIGGIFDataset::ReOpen()
     if (hGifFile == nullptr)
     {
         CPLError(CE_Failure, CPLE_OpenFailed,
-                 "DGifOpen() failed.  Perhaps the gif file is corrupt?\n");
+                 "DGifOpen() failed.  Perhaps the gif file is corrupt?");
 
         return CE_Failure;
     }