| commit | 5f835ec909d8c1406e988066b08ec178c2b79ffc | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Fri Apr 14 18:04:09 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 14 18:04:09 2023 +0000 |
| tree | 41ec67b11e222b14806e8886d221a206eb0fef75 | |
| parent | 469d1a33c1df9da0e266e9099addf5450b7dee46 [diff] | |
| parent | d5fc9eae52def407ae728bb878562fce3a6157a7 [diff] |
Merge "Use android::base::Basename instead of basename" am: d5fc9eae52 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2536808 Change-Id: Ia78bdfe758c95f207e4baf342265948acca63a05 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libmodprobe/libmodprobe.cpp b/libmodprobe/libmodprobe.cpp index e071c96..1971f01 100644 --- a/libmodprobe/libmodprobe.cpp +++ b/libmodprobe/libmodprobe.cpp
@@ -562,7 +562,7 @@ // Attempt to match both the canonical module name and the module filename. if (!fnmatch(pattern.c_str(), module.c_str(), 0)) { 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]); } }