Skip to content

Commit

Permalink
[Lint] ogr2ogr: simplify use of GDALVectorTranslateOptionsForBinary
Browse files Browse the repository at this point in the history
  • Loading branch information
@rouault
rouault committed Mar 15, 2024
1 parent faea940 commit ea940f1
Showing 1 changed file with 26 additions and 55 deletions.
81 changes: 26 additions & 55 deletions apps/ogr2ogr_bin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,26 +230,6 @@ static void Usage(bool bIsError, const char *pszAdditionalMsg = nullptr,
fprintf(stderr, "\nFAILURE: %s\n", pszAdditionalMsg);
}

/************************************************************************/
/* GDALVectorTranslateOptionsForBinaryNew() */
/************************************************************************/

static GDALVectorTranslateOptionsForBinary *
GDALVectorTranslateOptionsForBinaryNew()
{
return new GDALVectorTranslateOptionsForBinary;
}

/************************************************************************/
/* GDALVectorTranslateOptionsForBinaryFree() */
/************************************************************************/

static void GDALVectorTranslateOptionsForBinaryFree(
GDALVectorTranslateOptionsForBinary *psOptionsForBinary)
{
delete psOptionsForBinary;
}

/************************************************************************/
/* main() */
/************************************************************************/
Expand All @@ -275,8 +255,8 @@ MAIN_START(nArgc, papszArgv)
bool bCloseODS = true;
GDALDatasetH hDstDS = nullptr;
int nRetCode = 1;
GDALVectorTranslateOptionsForBinary *psOptionsForBinary = nullptr;
GDALVectorTranslateOptions *psOptions = nullptr;
GDALVectorTranslateOptionsForBinary sOptionsForBinary;

nArgc = OGRGeneralCmdLineProcessor(nArgc, &papszArgv, 0);

Expand Down Expand Up @@ -312,31 +292,28 @@ MAIN_START(nArgc, papszArgv)
}
}

psOptionsForBinary = GDALVectorTranslateOptionsForBinaryNew();
psOptions =
GDALVectorTranslateOptionsNew(papszArgv + 1, psOptionsForBinary);
GDALVectorTranslateOptionsNew(papszArgv + 1, &sOptionsForBinary);

if (psOptions == nullptr)
{
Usage(true);
GDALVectorTranslateOptionsForBinaryFree(psOptionsForBinary);
goto exit;
}

if (psOptionsForBinary->osDataSource.empty() ||
!psOptionsForBinary->bDestSpecified)
if (sOptionsForBinary.osDataSource.empty() ||
!sOptionsForBinary.bDestSpecified)
{
if (!psOptionsForBinary->bDestSpecified)
if (!sOptionsForBinary.bDestSpecified)
Usage(true, "no target datasource provided");
else
Usage(true, "no source datasource provided");
GDALVectorTranslateOptionsFree(psOptions);
GDALVectorTranslateOptionsForBinaryFree(psOptionsForBinary);
goto exit;
}

if (psOptionsForBinary->osDestDataSource == "/vsistdout/")
psOptionsForBinary->bQuiet = true;
if (sOptionsForBinary.osDestDataSource == "/vsistdout/")
sOptionsForBinary.bQuiet = true;

/* -------------------------------------------------------------------- */
/* Open data source. */
Expand All @@ -345,14 +322,13 @@ MAIN_START(nArgc, papszArgv)
// Avoid opening twice the same datasource if it is both the input and
// output Known to cause problems with at least FGdb, SQlite and GPKG
// drivers. See #4270
if (psOptionsForBinary->eAccessMode != ACCESS_CREATION &&
psOptionsForBinary->osDestDataSource ==
psOptionsForBinary->osDataSource)
if (sOptionsForBinary.eAccessMode != ACCESS_CREATION &&
sOptionsForBinary.osDestDataSource == sOptionsForBinary.osDataSource)
{
hODS = GDALOpenEx(psOptionsForBinary->osDataSource.c_str(),
hODS = GDALOpenEx(sOptionsForBinary.osDataSource.c_str(),
GDAL_OF_UPDATE | GDAL_OF_VECTOR,
psOptionsForBinary->aosAllowInputDrivers.List(),
psOptionsForBinary->aosOpenOptions.List(), nullptr);
sOptionsForBinary.aosAllowInputDrivers.List(),
sOptionsForBinary.aosOpenOptions.List(), nullptr);

GDALDriverH hDriver =
hODS != nullptr ? GDALGetDatasetDriver(hODS) : nullptr;
Expand All @@ -363,10 +339,10 @@ MAIN_START(nArgc, papszArgv)
EQUAL(GDALGetDescription(hDriver), "SQLite") ||
EQUAL(GDALGetDescription(hDriver), "GPKG")))
{
hDS = GDALOpenEx(
psOptionsForBinary->osDataSource.c_str(), GDAL_OF_VECTOR,
psOptionsForBinary->aosAllowInputDrivers.List(),
psOptionsForBinary->aosOpenOptions.List(), nullptr);
hDS = GDALOpenEx(sOptionsForBinary.osDataSource.c_str(),
GDAL_OF_VECTOR,
sOptionsForBinary.aosAllowInputDrivers.List(),
sOptionsForBinary.aosOpenOptions.List(), nullptr);
}
else
{
Expand All @@ -376,10 +352,9 @@ MAIN_START(nArgc, papszArgv)
}
else
{
hDS =
GDALOpenEx(psOptionsForBinary->osDataSource.c_str(), GDAL_OF_VECTOR,
psOptionsForBinary->aosAllowInputDrivers.List(),
psOptionsForBinary->aosOpenOptions.List(), nullptr);
hDS = GDALOpenEx(sOptionsForBinary.osDataSource.c_str(), GDAL_OF_VECTOR,
sOptionsForBinary.aosAllowInputDrivers.List(),
sOptionsForBinary.aosOpenOptions.List(), nullptr);
}

/* -------------------------------------------------------------------- */
Expand All @@ -391,7 +366,7 @@ MAIN_START(nArgc, papszArgv)

CPLError(CE_Failure, CPLE_AppDefined,
"Unable to open datasource `%s' with the following drivers.",
psOptionsForBinary->osDataSource.c_str());
sOptionsForBinary.osDataSource.c_str());

for (int iDriver = 0; iDriver < poDM->GetDriverCount(); iDriver++)
{
Expand All @@ -405,20 +380,19 @@ MAIN_START(nArgc, papszArgv)
}

GDALVectorTranslateOptionsFree(psOptions);
GDALVectorTranslateOptionsForBinaryFree(psOptionsForBinary);
goto exit;
}

if (hODS != nullptr && !psOptionsForBinary->osFormat.empty())
if (hODS != nullptr && !sOptionsForBinary.osFormat.empty())
{
GDALDriverManager *poDM = GetGDALDriverManager();

GDALDriver *poDriver =
poDM->GetDriverByName(psOptionsForBinary->osFormat.c_str());
poDM->GetDriverByName(sOptionsForBinary.osFormat.c_str());
if (poDriver == nullptr)
{
fprintf(stderr, "Unable to find driver `%s'.\n",
psOptionsForBinary->osFormat.c_str());
sOptionsForBinary.osFormat.c_str());
fprintf(stderr, "The following drivers are available:\n");

for (int iDriver = 0; iDriver < poDM->GetDriverCount(); iDriver++)
Expand All @@ -436,12 +410,11 @@ MAIN_START(nArgc, papszArgv)
}
}
GDALVectorTranslateOptionsFree(psOptions);
GDALVectorTranslateOptionsForBinaryFree(psOptionsForBinary);
goto exit;
}
}

if (!(psOptionsForBinary->bQuiet))
if (!(sOptionsForBinary.bQuiet))
{
GDALVectorTranslateOptionsSetProgress(psOptions, GDALTermProgress,
nullptr);
Expand All @@ -450,17 +423,15 @@ MAIN_START(nArgc, papszArgv)
{
// TODO(schwehr): Remove scope after removing gotos
int bUsageError = FALSE;
hDstDS =
GDALVectorTranslate(psOptionsForBinary->osDestDataSource.c_str(),
hODS, 1, &hDS, psOptions, &bUsageError);
hDstDS = GDALVectorTranslate(sOptionsForBinary.osDestDataSource.c_str(),
hODS, 1, &hDS, psOptions, &bUsageError);
if (bUsageError)
Usage(true);
else
nRetCode = hDstDS ? 0 : 1;
}

GDALVectorTranslateOptionsFree(psOptions);
GDALVectorTranslateOptionsForBinaryFree(psOptionsForBinary);

if (hDS)
GDALClose(hDS);
Expand Down

0 comments on commit ea940f1

Please sign in to comment.