Skip to content

Commit eb3802c

Browse files
committed
various minor bug fixes in dl.c
1 parent 483c9ee commit eb3802c

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/lib/util/dl.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ int dl_symbol_init(dl_loader_t *dl_loader, dl_t const *dl)
258258
}
259259

260260
if (init->func(dl, sym, init->uctx) < 0) {
261-
fr_strerror_printf("Initialiser \"%s\" failed", buffer);
261+
fr_strerror_printf("Initialiser failed for %s", dl->name);
262262
return -1;
263263
}
264264
}
@@ -830,7 +830,7 @@ int dl_search_path_prepend(dl_loader_t *dl_loader, char const *lib_dir)
830830
char *new;
831831

832832
if (!dl_loader->lib_dir) {
833-
dl_loader->lib_dir = talloc_strdup(dl_loader->lib_dir, lib_dir);
833+
dl_loader->lib_dir = talloc_strdup(dl_loader, lib_dir);
834834
if (!dl_loader->lib_dir) {
835835
oom:
836836
fr_strerror_const("Failed allocating memory for dl search path");
@@ -860,7 +860,7 @@ int dl_search_path_append(dl_loader_t *dl_loader, char const *lib_dir)
860860
char *new;
861861

862862
if (!dl_loader->lib_dir) {
863-
dl_loader->lib_dir = talloc_strdup(dl_loader->lib_dir, lib_dir);
863+
dl_loader->lib_dir = talloc_strdup(dl_loader, lib_dir);
864864
if (!dl_loader->lib_dir) {
865865
oom:
866866
fr_strerror_const("Failed allocating memory for dl search path");
@@ -976,11 +976,11 @@ bool dl_loader_set_static(dl_loader_t *dl_loader, bool do_static)
976976
*/
977977
void dl_loader_debug(FILE *fp, dl_loader_t *dl)
978978
{
979-
fprintf(fp, "dl_loader %p", dl);
979+
fprintf(fp, "dl_loader %p\n", dl);
980980
fprintf(fp, "lib_dir : %s\n", dl->lib_dir);
981981
fprintf(fp, "do_dlclose : %s\n", dl->do_dlclose ? "yes" : "no");
982982
fprintf(fp, "uctx : %p\n", dl->uctx);
983-
fprintf(fp, "uctx_free : %s\n", dl->do_dlclose ? "yes" : "no");
983+
fprintf(fp, "uctx_free : %s\n", dl->uctx_free ? "yes" : "no");
984984
fprintf(fp, "defer_symbol_init : %s\n", dl->defer_symbol_init ? "yes" : "no");
985985

986986
fr_dlist_foreach(&dl->sym_init, dl_symbol_init_t, sym) {

0 commit comments

Comments
 (0)