virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

cpu: Restructure code to avoid pointless ret variable indirection

Browse Source 
libavutil/cpu.c:133:9: warning: unused variable ‘ret’ [-Wunused-variable]
This commit is contained in:
Diego Biurrun 2013-06-01 15:38:51 +02:00
parent 46ce9ded96
commit f0ce1d9909
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavutil/cpu.c
View File

@ -130,27 +130,23 @@ int av_parse_cpu_flags(const char *s)
int av_cpu_count(void) int av_cpu_count(void)
{ {
int ret, nb_cpus = 1; int nb_cpus = 1;
#if HAVE_SCHED_GETAFFINITY && defined(CPU_COUNT) #if HAVE_SCHED_GETAFFINITY && defined(CPU_COUNT)
cpu_set_t cpuset; cpu_set_t cpuset;
CPU_ZERO(&cpuset); CPU_ZERO(&cpuset);
ret = sched_getaffinity(0, sizeof(cpuset), &cpuset); if (!sched_getaffinity(0, sizeof(cpuset), &cpuset))
if (!ret) {
nb_cpus = CPU_COUNT(&cpuset); nb_cpus = CPU_COUNT(&cpuset);
}
#elif HAVE_GETPROCESSAFFINITYMASK #elif HAVE_GETPROCESSAFFINITYMASK
DWORD_PTR proc_aff, sys_aff; DWORD_PTR proc_aff, sys_aff;
ret = GetProcessAffinityMask(GetCurrentProcess(), &proc_aff, &sys_aff); if (GetProcessAffinityMask(GetCurrentProcess(), &proc_aff, &sys_aff))
if (ret)
nb_cpus = av_popcount64(proc_aff); nb_cpus = av_popcount64(proc_aff);
#elif HAVE_SYSCTL && defined(HW_NCPU) #elif HAVE_SYSCTL && defined(HW_NCPU)
int mib[2] = { CTL_HW, HW_NCPU }; int mib[2] = { CTL_HW, HW_NCPU };
size_t len = sizeof(nb_cpus); size_t len = sizeof(nb_cpus);
ret = sysctl(mib, 2, &nb_cpus, &len, NULL, 0); if (sysctl(mib, 2, &nb_cpus, &len, NULL, 0) == -1)
if (ret == -1)
nb_cpus = 0; nb_cpus = 0;
#elif HAVE_SYSCONF && defined(_SC_NPROC_ONLN) #elif HAVE_SYSCONF && defined(_SC_NPROC_ONLN)
nb_cpus = sysconf(_SC_NPROC_ONLN); nb_cpus = sysconf(_SC_NPROC_ONLN);