colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform: minor refactoring in _nl_get_vtable()

Browse Source
This commit is contained in:
Thomas Haller
2015-08-25 22:24:10 +02:00
parent 677d802be6
commit 31902f8f6b
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/platform/nm-linux-platform.c
View File

@@ -152,19 +152,16 @@ _nl_get_vtable (void)
static struct libnl_vtable vtable; static struct libnl_vtable vtable;
if (G_UNLIKELY (!vtable.f_nl_has_capability)) { if (G_UNLIKELY (!vtable.f_nl_has_capability)) {
void *handle; vtable.handle = dlopen ("libnl-3.so.200", RTLD_LAZY | RTLD_NOLOAD);
if (vtable.handle) {
handle = dlopen ("libnl-3.so.200", RTLD_LAZY | RTLD_NOLOAD); vtable.f_nl_has_capability = dlsym (vtable.handle, "nl_has_capability");
if (handle) {
vtable.handle = handle;
vtable.f_nl_has_capability = dlsym (handle, "nl_has_capability");
} }
if (!vtable.f_nl_has_capability) if (!vtable.f_nl_has_capability)
vtable.f_nl_has_capability = &_nl_f_nl_has_capability; vtable.f_nl_has_capability = &_nl_f_nl_has_capability;
g_return_val_if_fail (handle, &vtable); g_return_val_if_fail (vtable.handle, &vtable);
g_return_val_if_fail (&nl_connect == (int (*) (struct nl_sock *, int)) dlsym (handle, "nl_connect"), &vtable); g_return_val_if_fail (&nl_connect == (int (*) (struct nl_sock *, int)) dlsym (vtable.handle, "nl_connect"), &vtable);
} }
return &vtable; return &vtable;