]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
core: Fix unused variable error in handle_show_sysinfo.
authorCorey Farrell <git@cfware.com>
Wed, 20 Dec 2017 16:13:13 +0000 (11:13 -0500)
committerCorey Farrell <git@cfware.com>
Wed, 20 Dec 2017 16:16:48 +0000 (10:16 -0600)
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

main/asterisk.c

index f8e31d5a0361205783dc5cb68f8d9ee0e9d151ce..01107e2176b40e764a344bdf57d2d4f994a25a85 100644 (file)
@@ -795,7 +795,9 @@ static int swapmode(int *used, int *total)
 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;
@@ -885,7 +887,7 @@ static char *handle_show_sysinfo(struct ast_cli_entry *e, int cmd, struct ast_cl
 #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