Skip to content

upsdrvctl did not play along with ENABLE_SHARED_PRIVATE_LIBS well #3292

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
jimklimov merged 2 commits into from
Feb 2, 2026
+5 −1
Merged

upsdrvctl did not play along with ENABLE_SHARED_PRIVATE_LIBS well #3292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b37361
drivers/upsdrvctl.c: register callback_upsconf_args if we ENABLE_SHAR…
jimklimov Jan 31, 2026
85ec5af
tools/nut-scanner/nutscan-init.c: comment on do_upsconf_args() placeh…
jimklimov Jan 31, 2026
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
4 changes: 4 additions & 0 deletions drivers/upsdrvctl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1622,6 +1622,10 @@ int main(int argc, char **argv)

prog = argv[0];

#if (defined ENABLE_SHARED_PRIVATE_LIBS) && ENABLE_SHARED_PRIVATE_LIBS
callback_upsconf_args = do_upsconf_args;
#endif

/* Historically special banner*/
snprintf(progdesc, sizeof(progdesc), "%s - UPS driver controller", xbasename(prog));
print_banner_once(progdesc, 0);
Expand Down
2 changes: 1 addition & 1 deletion tools/nut-scanner/nutscan-init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ size_t max_threads_ipmi = 0; /* limits not yet known */
#endif /* HAVE_PTHREAD */

#ifdef WIN32
/* Stub for libupsclient */
/* Stub for libupsclient, no need to register a callback for ENABLE_SHARED_PRIVATE_LIBS builds */
void do_upsconf_args(char *confupsname, char *var, char *val) {
NUT_UNUSED_VARIABLE(confupsname);
NUT_UNUSED_VARIABLE(var);
Expand Down
Loading