[Asterisk-code-review] core: Fix unused variable error in handle show sysinfo. (asterisk[master])

Corey Farrell asteriskteam at digium.com
Wed Dec 20 10:15:50 CST 2017


Corey Farrell has uploaded this change for review. ( https://gerrit.asterisk.org/7673


Change subject: core: Fix unused variable error in handle_show_sysinfo.
......................................................................

core: Fix unused variable error in handle_show_sysinfo.

Apparently in OSX it's possible for OSX to HAVE_SYSCTL but not
HAVE_SYSINFO or HAVE_SWAPCTL.  In this case freeswap caused an unused
variable error.

ASTERISK-26563 #close

Change-Id: I8ec5b1897b786cc1abaf62264aa75039eea05510
---
M main/asterisk.c
1 file changed, 3 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/73/7673/1

diff --git a/main/asterisk.c b/main/asterisk.c
index 73c03a2..4c7abd6 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -727,7 +727,9 @@
 static char *handle_show_sysinfo(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
 	uint64_t physmem, freeram;
+#if defined(HAVE_SYSINFO) || defined(HAVE_SWAPCTL)
 	uint64_t freeswap = 0;
+#endif
 	int nprocs = 0;
 	long uptime = 0;
 	int totalswap = 0;
@@ -817,7 +819,7 @@
 #if defined(HAVE_SYSINFO)
 	ast_cli(a->fd, "  Buffer RAM:                %" PRIu64 " KiB\n", ((uint64_t) sys_info.bufferram * sys_info.mem_unit) / 1024);
 #endif
-#if defined(HAVE_SWAPCTL) || defined(HAVE_SYSINFO)
+#if defined(HAVE_SYSINFO) || defined(HAVE_SWAPCTL)
 	ast_cli(a->fd, "  Total Swap Space:          %d KiB\n", totalswap);
 	ast_cli(a->fd, "  Free Swap Space:           %" PRIu64 " KiB\n\n", freeswap);
 #endif

-- 
To view, visit https://gerrit.asterisk.org/7673
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ec5b1897b786cc1abaf62264aa75039eea05510
Gerrit-Change-Number: 7673
Gerrit-PatchSet: 1
Gerrit-Owner: Corey Farrell <git at cfware.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20171220/ca2ea8b8/attachment-0001.html>


More information about the asterisk-code-review mailing list