Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a4f63d2 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Use android::base::Basename instead of basename" am: d5fc9eae am:... 

Merge "Use android::base::Basename instead of basename" am: d5fc9eae am: 5f835ec9 am: ebe0cffe

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2536808



Change-Id: I7b50a4aa4e9aa828667f9411a1db1022f12046fc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4b558333 ebe0cffe

libmodprobe/libmodprobe.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -562,7 +562,7 @@ std::vector<std::string> Modprobe::ListModules(const std::string& pattern) { 
        // Attempt to match both the canonical module name and the module filename.

        // Attempt to match both the canonical module name and the module filename.

        if (!fnmatch(pattern.c_str(), module.c_str(), 0)) {

        if (!fnmatch(pattern.c_str(), module.c_str(), 0)) {

            rv.emplace_back(module);

            rv.emplace_back(module);

        } else if (!fnmatch(pattern.c_str(), basename(deps[0].c_str()), 0)) {

        } else if (!fnmatch(pattern.c_str(), android::base::Basename(deps[0]).c_str(), 0)) {

            rv.emplace_back(deps[0]);

            rv.emplace_back(deps[0]);

        }

        }

    }

    }