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

Add missing lambda return types. #320

Merged
merged 2 commits into from
Aug 8, 2019
Merged

Add missing lambda return types. #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbfe37b
Add missing lambda return types.
Allen-Webb Aug 1, 2019
fc330a8
Fix return check of ldap tests.
Allen-Webb Aug 2, 2019
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
2 changes: 1 addition & 1 deletion src/Common/Utility.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ namespace usbguard
std::function<std::string(const std::string&, const struct dirent*)> filter,
std::function<int(const std::string&, const std::string&)> loader,
std::function<bool(const std::pair<std::string, std::string>&, const std::pair<std::string, std::string>&)> sorter = \
[](const std::pair<std::string, std::string>& a, const std::pair<std::string, std::string>& b)
[](const std::pair<std::string, std::string>& a, const std::pair<std::string, std::string>& b) -> bool
{
return a.first < b.first;
},
Expand Down
4 changes: 2 additions & 2 deletions src/Library/UMockdevDeviceManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ namespace usbguard
_umockdev_deviceroot = std::string(envval);
_testbed.reset(umockdev_testbed_new());
USBGUARD_LOG(Info) << "umockdev device directory set to " << _umockdev_deviceroot;
const auto lambdaUMockdevFilterEntry = [](const std::string& fullpath, const struct dirent* dirent) {
const auto lambdaUMockdevFilterEntry = [](const std::string& fullpath, const struct dirent* dirent) -> std::string {
(void)dirent;
struct stat st = {};

Expand All @@ -305,7 +305,7 @@ namespace usbguard
return std::string();
}
};
const auto lambdaUMockdevAddFromFile = [this](const std::string& fullpath, const std::string& loadpath) {
const auto lambdaUMockdevAddFromFile = [this](const std::string& fullpath, const std::string& loadpath) -> int {
(void)fullpath;

for (const auto& device_path : umockdevLoadFromFile(loadpath)) {
Expand Down
2 changes: 1 addition & 1 deletion src/Tests/LDAP/UseCase/ldap-test-1.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,4 +133,4 @@ fi

nss_restore

exit $(( $RC + $GREP + $KILLRC ))
exit $(( $RC + $GREP1 + $GREP2 + $KILLRC ))
2 changes: 1 addition & 1 deletion src/Tests/LDAP/UseCase/ldap-test-2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,4 +133,4 @@ fi

nss_restore

exit $(( $RC + $GREP + $KILLRC ))
exit $(( $RC + $GREP1 + $GREP2 + $KILLRC ))
2 changes: 1 addition & 1 deletion src/Tests/LDAP/UseCase/ldap-test-5.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,4 +198,4 @@ fi

nss_restore

exit $(( $RC + $GREP + $KILLRC + $WC + $DIFF ))
exit $(( $RC + $GREP1 + $GREP2 + $KILLRC + $WC + $DIFF ))