core: Fix unused variable error in handle_show_sysinfo.

The previous fix broke the case
HAVE_SYSINFO = no
HAVE_SYSCTL = yes
HAVE_SWAPCTL = no
which occurs on FreeBSD 11.1 for example.

ASTERISK-26563

Change-Id: If77c39bc75f0b83a6c8a24ecb2fa69be8846160a

diff --git a/main/asterisk.c b/main/asterisk.c
index 01107e2176b40e764a344bdf57d2d4f994a25a85..d2230dc4d62a8c3b95395bb42c839df6ca8bec4a 100644 (file)
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -782,12 +782,6 @@ static int swapmode(int *used, int *total)
        ast_free(swdev);
        return 1;
 }
-#elif defined(HAVE_SYSCTL) && !defined(HAVE_SYSINFO)
-static int swapmode(int *used, int *total)
-{
-       *used = *total = 0;
-       return 1;
-}
 #endif
 
 #if defined(HAVE_SYSINFO) || defined(HAVE_SYSCTL)
@@ -796,11 +790,11 @@ static char *handle_show_sysinfo(struct ast_cli_entry *e, int cmd, struct ast_cl
 {
        uint64_t physmem, freeram;
 #if defined(HAVE_SYSINFO) || defined(HAVE_SWAPCTL)
+       int totalswap = 0;
        uint64_t freeswap = 0;
 #endif
        int nprocs = 0;
        long uptime = 0;
-       int totalswap = 0;
 #if defined(HAVE_SYSINFO)
        struct sysinfo sys_info;
 #elif defined(HAVE_SYSCTL)
@@ -808,7 +802,10 @@ static char *handle_show_sysinfo(struct ast_cli_entry *e, int cmd, struct ast_cl
        struct vmtotal vmtotal;
        struct timeval  boottime;
        time_t  now;
-       int mib[2], pagesize, usedswap = 0;
+       int mib[2], pagesize;
+#if defined(HAVE_SWAPCTL)
+       int usedswap = 0;
+#endif
        size_t len;
 #endif
 
@@ -868,8 +865,10 @@ static char *handle_show_sysinfo(struct ast_cli_entry *e, int cmd, struct ast_cl
        sysctl(mib, 2, &vmtotal, &len, NULL, 0);
        freeram = (vmtotal.t_free << pageshift);
        /* generate swap usage and totals */
+#if defined(HAVE_SWAPCTL)
        swapmode(&usedswap, &totalswap);
        freeswap = (totalswap - usedswap);
+#endif
        /* grab number of processes */
 #if defined(__OpenBSD__)
        mib[0] = CTL_KERN;