Skip to content

refactor: renamed local plugin parameter to _plugin to avoid shadowing a global variable #8

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

Merged
AlexandreMunsch merged 1 commit into from
Oct 19, 2025
Merged

refactor: renamed local plugin parameter to _plugin to avoid shadowing a global variable #8

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
if: ${{ matrix.env.runner == 'ubuntu-latest' }}
run: |
sudo apt-get update
sudo apt-get install -y clang cmake cppcheck clang-format clang-tidy gcc pre-commit
sudo apt-get install -y clang cmake cppcheck clang-format clang-tidy gcc pre-commit libpcsclite-dev

- name: Install macOS reqs
if: ${{ matrix.env.runner == 'macos-latest' }}
Expand All @@ -43,8 +43,3 @@ jobs:
run: |
cmake ${{ matrix.env.generator }} -B build -S . -DCMAKE_TOOLCHAIN_FILE=${{ matrix.env.toolchain }}
cmake --build build -j8

- name: Run Linux/macOS tests
if: ${{ matrix.env.runner == 'ubuntu-latest' || matrix.env.runner == 'macos-latest' }}
run: |
./build/bin/keypopcalypsocryptolegacysam_ut
6 changes: 3 additions & 3 deletions Example_Service/src/main/UseCase1_BasicSelection/Main_BasicSelection_Pcsc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,17 +132,17 @@ initGenericCardExtensionService() {
*/
static std::shared_ptr<CardReader>
getReader(
std::shared_ptr<Plugin> plugin,
std::shared_ptr<Plugin> _plugin,
const std::string& readerNameRegex,
const bool isContactless,
const PcscReader::IsoProtocol isoProtocol,
const PcscReader::SharingMode sharingMode,
const std::string& physicalProtocolName,
const std::string& logicalProtocolName) {
const auto reader(plugin->findReader(readerNameRegex));
const auto reader(_plugin->findReader(readerNameRegex));

auto pcscReader(std::dynamic_pointer_cast<PcscReader>(
plugin->getReaderExtension(typeid(PcscReader), reader->getName())));
_plugin->getReaderExtension(typeid(PcscReader), reader->getName())));

pcscReader->setContactless(isContactless)
.setIsoProtocol(isoProtocol)
Expand Down
6 changes: 3 additions & 3 deletions ...ple_Service/src/main/UseCase2_ProtocolBasedSelection/Main_ProtocolBasedSelection_Pcsc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,15 @@ initGenericCardExtensionService() {
*/
static std::shared_ptr<CardReader>
getReader(
std::shared_ptr<Plugin> plugin,
std::shared_ptr<Plugin> _plugin,
const std::string& readerNameRegex,
const bool isContactless,
const PcscReader::IsoProtocol isoProtocol,
const PcscReader::SharingMode sharingMode) {
const auto reader(plugin->findReader(readerNameRegex));
const auto reader(_plugin->findReader(readerNameRegex));

auto pcscReader(std::dynamic_pointer_cast<PcscReader>(
plugin->getReaderExtension(typeid(PcscReader), reader->getName())));
_plugin->getReaderExtension(typeid(PcscReader), reader->getName())));

pcscReader->setContactless(isContactless)
.setIsoProtocol(isoProtocol)
Expand Down
Loading