1
0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-10-30 23:37:45 +02:00

Remove extraneous use/include statements.

Use conditional loading to make docs work in the absence of LibC.

Somehow this also required a use statement to be added. Perl, go figure.
This commit is contained in:
David Steele
2018-11-24 20:31:35 -05:00
parent 801e2a5a2c
commit 78fe642eae
9 changed files with 9 additions and 8 deletions

View File

@@ -19,6 +19,7 @@ use pgBackRest::Common::String;
use pgBackRest::Version;
use BackRestDoc::Common::DocConfig;
use BackRestDoc::Common::DocRender;
use pgBackRestBuild::Build::Common;
use pgBackRestBuild::Config::Data;

View File

@@ -66,7 +66,6 @@ use Getopt::Long qw(GetOptions);
use Storable qw(dclone);
use pgBackRest::Common::Exception;
use pgBackRest::Common::Ini;
use pgBackRest::Common::Io::Base;
use pgBackRest::Common::Log;
use pgBackRest::Common::Wait;

View File

@@ -14,7 +14,6 @@ use Exporter qw(import);
use Storable qw(dclone);
use pgBackRest::Common::Exception;
use pgBackRest::Common::Ini;
use pgBackRest::Common::Log;
use pgBackRest::Common::String;
use pgBackRest::Version;
@@ -525,6 +524,10 @@ sub backrestConfig
if ($self->{bExe} && $self->isRequired($oSection))
{
# Load module dynamically
require pgBackRest::Common::Ini;
pgBackRest::Common::Ini->import();
my ($bCacheHit, $strCacheType, $hCacheKey, $hCacheValue) = $self->cachePop('cfg-' . PROJECT_EXE, $hCacheKey);
if ($bCacheHit)

View File

@@ -11,7 +11,6 @@ use Carp qw(confess);
use Exporter qw(import);
our @EXPORT = qw();
use pgBackRest::Common::Ini;
use pgBackRest::Common::Log;
use pgBackRest::Common::String;

View File

@@ -59,6 +59,10 @@
<p>Add <code>ServiceError</code> for errors from a service that can be retried.</p>
</release-item>
<release-item>
<p>Remove extraneous <code>use</code>/<code>include</code> statements.</p>
</release-item>
<release-item>
<p>Remove embedded semicolon from <code>String</code> constant macros.</p>
</release-item>

View File

@@ -9,7 +9,6 @@ Ini Handler
#include "common/memContext.h"
#include "common/ini.h"
#include "common/type/keyValue.h"
#include "storage/helper.h"
/***********************************************************************************************************************************
Contains information about the ini

View File

@@ -18,7 +18,6 @@ use Exporter qw(import);
use File::Basename qw(dirname);
use Getopt::Long qw(GetOptions);
use pgBackRest::Common::Ini;
use pgBackRest::Common::Log;
use pgBackRest::Common::String;
use pgBackRest::Version;

View File

@@ -15,7 +15,6 @@ use Exporter qw(import);
our @EXPORT = qw();
use File::Basename qw(dirname);
use pgBackRest::Common::Ini;
use pgBackRest::Common::Log;
use pgBackRest::Version;

View File

@@ -28,11 +28,9 @@ use lib dirname(dirname($0)) . '/build/lib';
use lib dirname(dirname($0)) . '/doc/lib';
use pgBackRest::Common::Exception;
use pgBackRest::Common::Ini;
use pgBackRest::Common::Log;
use pgBackRest::Common::String;
use pgBackRest::Common::Wait;
use pgBackRest::DbVersion;
use pgBackRest::Storage::Posix::Driver;
use pgBackRest::Storage::Local;
use pgBackRest::Version;