kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 04:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: Fix unused variable error in handle_show_sysinfo.

Browse Source 
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
This commit is contained in:
Alexander Traud
2018-01-27 16:44:21 +01:00
parent da5859246d
commit d9e42f27b9
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main/asterisk.c
View File

@@ -714,12 +714,6 @@ static int swapmode(int *used, int *total)
ast_free(swdev); ast_free(swdev);
return 1; return 1;
} }
#elif defined(HAVE_SYSCTL) && !defined(HAVE_SYSINFO)
static int swapmode(int *used, int *total)
{
*used = *total = 0;
return 1;
}
#endif #endif
#if defined(HAVE_SYSINFO) || defined(HAVE_SYSCTL) #if defined(HAVE_SYSINFO) || defined(HAVE_SYSCTL)
@@ -728,11 +722,11 @@ static char *handle_show_sysinfo(struct ast_cli_entry *e, int cmd, struct ast_cl
{ {
uint64_t physmem, freeram; uint64_t physmem, freeram;
#if defined(HAVE_SYSINFO) || defined(HAVE_SWAPCTL) #if defined(HAVE_SYSINFO) || defined(HAVE_SWAPCTL)
int totalswap = 0;
uint64_t freeswap = 0; uint64_t freeswap = 0;
#endif #endif
int nprocs = 0; int nprocs = 0;
long uptime = 0; long uptime = 0;
int totalswap = 0;
#if defined(HAVE_SYSINFO) #if defined(HAVE_SYSINFO)
struct sysinfo sys_info; struct sysinfo sys_info;
#elif defined(HAVE_SYSCTL) #elif defined(HAVE_SYSCTL)
@@ -740,7 +734,10 @@ static char *handle_show_sysinfo(struct ast_cli_entry *e, int cmd, struct ast_cl
struct vmtotal vmtotal; struct vmtotal vmtotal;
struct timeval boottime; struct timeval boottime;
time_t now; time_t now;
int mib[2], pagesize, usedswap = 0; int mib[2], pagesize;
#if defined(HAVE_SWAPCTL)
int usedswap = 0;
#endif
size_t len; size_t len;
#endif #endif
@@ -800,8 +797,10 @@ static char *handle_show_sysinfo(struct ast_cli_entry *e, int cmd, struct ast_cl
sysctl(mib, 2, &vmtotal, &len, NULL, 0); sysctl(mib, 2, &vmtotal, &len, NULL, 0);
freeram = (vmtotal.t_free << pageshift); freeram = (vmtotal.t_free << pageshift);
/* generate swap usage and totals */ /* generate swap usage and totals */
#if defined(HAVE_SWAPCTL)
swapmode(&usedswap, &totalswap); swapmode(&usedswap, &totalswap);
freeswap = (totalswap - usedswap); freeswap = (totalswap - usedswap);
#endif
/* grab number of processes */ /* grab number of processes */
#if defined(__OpenBSD__) #if defined(__OpenBSD__)
mib[0] = CTL_KERN; mib[0] = CTL_KERN;