Skip to content
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

Jump to bottom

Getenv null check #399

Merged
merged 2 commits into from
Nov 30, 2022
Merged

Getenv null check #399

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
e3eadd0
Don't forceAll to Any by default
bboudaoud-nv Nov 29, 2022
141f32f
Null check for host/username getenv() calls
bboudaoud-nv Nov 29, 2022
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
2 changes: 1 addition & 1 deletion source/SystemConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class SystemConfig {
SystemConfig(const Any& any);

static SystemConfig load(String filename, bool saveJSON);
Any toAny(const bool forceAll = true) const;
Any toAny(const bool forceAll = false) const;
void printToLog(); // Print the latency logger config to log.txt

};
9 changes: 7 additions & 2 deletions source/SystemInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@
SystemInfo SystemInfo::get(void) {
SystemInfo info;

info.hostName = getenv("COMPUTERNAME"); // Get the host (computer) name
info.userName = getenv("USERNAME"); // Get the current logged in username
char *ptr = getenv("COMPUTERNAME"); // Get the host (computer) name (if available)
if (notNull(ptr)) info.hostName = ptr;
else info.hostName = "unknown";

ptr = getenv("USERNAME"); // Get the current logged in username (if available)
if (notNull(ptr)) info.userName = ptr;
else info.userName = "unknown";

// Get CPU name string
int cpuInfo[4] = { -1 };
Expand Down
2 changes: 1 addition & 1 deletion source/SystemInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ class SystemInfo {

static SystemInfo get(void); // Get the system info using (windows) calls

Any toAny(const bool forceAll = true) const;
Any toAny(const bool forceAll = false) const;
void printToLog();
};