Skip to content

Problem: nutscan_init() called before debug is enabled #502

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
clepple merged 1 commit into from
Nov 29, 2017
Merged

Problem: nutscan_init() called before debug is enabled #502

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions tools/nut-scanner/nut-scanner.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,6 @@ int main(int argc, char *argv[])
xml_sec.usec_timeout = -1; /* Override with the "timeout" common setting later */
xml_sec.peername = NULL;

nutscan_init();

display_func = nutscan_display_ups_conf;

/* Note: the getopts print an error message about unknown arguments
Expand Down Expand Up @@ -468,6 +466,12 @@ int main(int argc, char *argv[])
/* BEWARE: allow_all does not include allow_eaton_serial! */
}

/* TODO: nutscan_init() should consider (via args? shared global vars?)
* which scan types we desire at this run, and not try to load irrelevant
* libraries.
*/
nutscan_init();

/* TODO/discuss : Should the #else...#endif code below for lack of pthreads
* during build also serve as a fallback for pthread failure at runtime?
*/
Expand Down