Skip to content

Commit 509ded4

Browse files
natoscottnatoscott
committed
Merge branches 'htop-merge' and 'macos-getaddrinfo'
3 parents 39ec336 + 8b1841d + 59d4fd9 commit 509ded4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1213
-669
lines changed

‎src/libpcp/src/access.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,7 @@ getHostAccessSpecs(const char *name, int *sts)
861861
}
862862
__pmHostEntFree(servInfo);
863863
}
864-
else {
864+
else if (hosterror()) {
865865
char errmsg[PM_MAXERRMSGLEN];
866866
PM_LOCK(__pmLock_extcall);
867867
pmstrncpy(errmsg, PM_MAXERRMSGLEN, hoststrerror()); /* THREADSAFE */

‎vendor/github.com/htop-dev/htop/.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/htop-dev/htop/.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/htop-dev/htop/AffinityPanel.c‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/htop-dev/htop/BatteryMeter.c‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/htop-dev/htop/CPUMeter.c‎

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/htop-dev/htop/CRT.c‎

Lines changed: 27 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/htop-dev/htop/CRT.h‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/htop-dev/htop/CommandLine.c‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/htop-dev/htop/DiskIOMeter.c‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)