diff options
Diffstat (limited to 'linker/linker_soinfo.cpp')
| -rw-r--r-- | linker/linker_soinfo.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/linker/linker_soinfo.cpp b/linker/linker_soinfo.cpp index 60fd242cc..287e757a9 100644 --- a/linker/linker_soinfo.cpp +++ b/linker/linker_soinfo.cpp @@ -485,11 +485,8 @@ static void call_function(const char* function_name __unused, } template <typename F> -static void call_array(const char* array_name __unused, - F* functions, - size_t count, - bool reverse, - const char* realpath) { +static inline void call_array(const char* array_name __unused, F* functions, size_t count, + bool reverse, const char* realpath) { if (functions == nullptr) { return; } @@ -695,7 +692,7 @@ void soinfo::set_soname(const char* soname) { if (has_min_version(2)) { soname_ = soname; } - strlcpy(old_name_, soname_, sizeof(old_name_)); + strlcpy(old_name_, soname_.c_str(), sizeof(old_name_)); #else soname_ = soname; #endif @@ -704,12 +701,12 @@ void soinfo::set_soname(const char* soname) { const char* soinfo::get_soname() const { #if defined(__work_around_b_24465209__) if (has_min_version(2)) { - return soname_; + return soname_.c_str(); } else { return old_name_; } #else - return soname_; + return soname_.c_str(); #endif } |