Skip to content

Ld load libgobject 2.0.so.0 #100

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
TheAssassin merged 4 commits into from
Apr 8, 2019
Merged

Ld load libgobject 2.0.so.0 #100

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe01757
Allow creating a DLHandle from a list of sonames
Apr 5, 2019
d9dbb1f
Fix libgobject loading in centos
Apr 5, 2019
222a09a
Use explicit nullptr checks
Apr 8, 2019
89bdc9e
anotate known libgobject-2 library names in the different distributions
Apr 8, 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
Prev Previous commit
Next Next commit
Use explicit nullptr checks
  • Loading branch information
Alexis Lopez Zubieta committed Apr 8, 2019
commit 222a09af47c63e22c404d2f8e0b0d17b0d67a559
6 changes: 3 additions & 3 deletions src/libappimage/utils/DLHandle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace appimage {
explicit DLHandle(const std::string& libName, int mode) : handle(nullptr), libName(libName) {
handle = dlopen(libName.c_str(), mode);

if (!handle)
if (handle == nullptr)
throw DLHandleError("Unable to load " + libName);
}

Expand All @@ -41,13 +41,13 @@ namespace appimage {
explicit DLHandle(std::initializer_list<const std::string> libNames, int mode) : handle(nullptr) {
for (const auto& item: libNames) {
handle = dlopen(item.c_str(), mode);
if (handle) {
if (handle != nullptr) {
libName = item;
break;
}
}

if (!handle) {
if (handle == nullptr) {
std::string libNamesStr;
for (const auto& item: libNames)
libNamesStr += " " + item;
Expand Down