From 76f979901e35b5c3462bf26074cea31ad816df63 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Fri, 17 Feb 2012 14:25:59 -0600 Subject: Fixes for variable shadowing (1/28) --- src/account.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/account.cc') diff --git a/src/account.cc b/src/account.cc index 36070a52..dcff5da0 100644 --- a/src/account.cc +++ b/src/account.cc @@ -49,28 +49,28 @@ account_t::~account_t() } } -account_t * account_t::find_account(const string& name, +account_t * account_t::find_account(const string& acct_name, const bool auto_create) { - accounts_map::const_iterator i = accounts.find(name); + accounts_map::const_iterator i = accounts.find(acct_name); if (i != accounts.end()) return (*i).second; char buf[8192]; - string::size_type sep = name.find(':'); + string::size_type sep = acct_name.find(':'); assert(sep < 256|| sep == string::npos); const char * first, * rest; if (sep == string::npos) { - first = name.c_str(); + first = acct_name.c_str(); rest = NULL; } else { - std::strncpy(buf, name.c_str(), sep); + std::strncpy(buf, acct_name.c_str(), sep); buf[sep] = '\0'; first = buf; - rest = name.c_str() + sep + 1; + rest = acct_name.c_str() + sep + 1; } account_t * account; -- cgit v1.2.3