Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename local variables to avoid shadowing outer function #1102

Merged
merged 1 commit into from Feb 4, 2023
Merged

Rename local variables to avoid shadowing outer function #1102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 15 additions & 15 deletions src/cache.cpp
View file
Open in desktop
Expand Up @@ -532,9 +532,9 @@ std::string CACHE::path_reshtml()
//
bool CACHE::mkdir_root()
{
std::string path_root = CACHE::path_root();
if( ! CACHE::jdmkdir( path_root ) ){
MISC::ERRMSG( "can't create " + path_root );
std::string pth_root = CACHE::path_root();
if( ! CACHE::jdmkdir( pth_root ) ){
MISC::ERRMSG( "can't create " + pth_root );
return false;
}

Expand All @@ -551,9 +551,9 @@ bool CACHE::mkdir_root()
bool CACHE::mkdir_imgroot()
{
// root
std::string path_img_root = CACHE::path_img_root();
if( ! CACHE::jdmkdir( path_img_root ) ){
MISC::ERRMSG( "can't create " + path_img_root );
std::string pth_img_root = CACHE::path_img_root();
if( ! CACHE::jdmkdir( pth_img_root ) ){
MISC::ERRMSG( "can't create " + pth_img_root );
return false;
}

Expand Down Expand Up @@ -581,9 +581,9 @@ bool CACHE::mkdir_imgroot()
bool CACHE::mkdir_imgroot_favorite()
{
// root
std::string path_img_root = CACHE::path_img_protect_root();
if( ! CACHE::jdmkdir( path_img_root ) ){
MISC::ERRMSG( "can't create " + path_img_root );
std::string pth_img_root = CACHE::path_img_protect_root();
if( ! CACHE::jdmkdir( pth_img_root ) ){
MISC::ERRMSG( "can't create " + pth_img_root );
return false;
}

Expand Down Expand Up @@ -630,9 +630,9 @@ bool CACHE::mkdir_parent_of_board( const std::string& url )
bool CACHE::mkdir_boardroot( const std::string& url )
{
// root
std::string path_board_root = CACHE::path_board_root( url );
if( ! CACHE::jdmkdir( path_board_root ) ){
MISC::ERRMSG( "can't create " + path_board_root );
std::string pth_board_root = CACHE::path_board_root( url );
if( ! CACHE::jdmkdir( pth_board_root ) ){
MISC::ERRMSG( "can't create " + pth_board_root );
return false;
}

Expand All @@ -653,9 +653,9 @@ bool CACHE::mkdir_boardroot( const std::string& url )
bool CACHE::mkdir_logroot()
{
// root
std::string path_logroot = CACHE::path_logroot();
if( ! CACHE::jdmkdir( path_logroot ) ){
MISC::ERRMSG( "can't create " + path_logroot );
std::string pth_logroot = CACHE::path_logroot();
if( ! CACHE::jdmkdir( pth_logroot ) ){
MISC::ERRMSG( "can't create " + pth_logroot );
return false;
}

Expand Down
4 changes: 2 additions & 2 deletions src/core.cpp
View file
Open in desktop
Expand Up @@ -3333,8 +3333,8 @@ void Core::exec_command_after_boot()
restore_focus( true, true );

// タイマーセット
sigc::slot< bool > slot_timeout = sigc::bind( sigc::mem_fun(*this, &Core::slot_timeout), 0 );
m_conn_timer = JDLIB::Timeout::connect( slot_timeout, TIMER_TIMEOUT );
sigc::slot< bool > slt_timeout = sigc::bind( sigc::mem_fun(*this, &Core::slot_timeout), 0 );
m_conn_timer = JDLIB::Timeout::connect( slt_timeout, TIMER_TIMEOUT );

// 2chログイン
if( SESSION::login2ch() ) slot_toggle_login2ch();
Expand Down