sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mm/mm_heap/mm_sem.c: Fix error that occurs when CONFIG_CPP_HAVE_VARARGS is not defined. In that case, the arguments to the debug macro will all be evaluated even though they are not used any variables that are references must at least be defined.

Browse Source
This commit is contained in:
Gregory Nutt 2019-06-03 09:02:55 -06:00
parent d375a26a6c
commit 2dae0ef0db
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/libc/syslog/lib_syslog.c
View File

@ -40,6 +40,7 @@
#include <nuttx/config.h>
#include <stdarg.h>
#include <syslog.h>
#include <nuttx/syslog/syslog.h>
@ -110,3 +111,4 @@ void syslog(int priority, FAR const IPTR char *fmt, ...)
vsyslog(priority, fmt, ap);
va_end(ap);
}

8
mm/mm_heap/mm_sem.c
View File

@ -294,16 +294,12 @@ void mm_givesemaphore(FAR struct mm_heap_s *heap)
#ifdef CONFIG_SMP
irqstate_t flags = enter_critical_section();
#endif
#if defined(CONFIG_DEBUG_ASSERTIONS) || \
(defined(MONITOR_MM_SEMAPHORE) && defined(CONFIG_DEBUG_INFO))
pid_t my_pid = getpid();
#endif
/* The current task should be holding at least one reference to the
* semaphore.
*/
DEBUGASSERT(heap->mm_holder == my_pid);
DEBUGASSERT(heap->mm_holder == getpid());
/* Does the current task hold multiple references to the semaphore */
@ -319,7 +315,7 @@ void mm_givesemaphore(FAR struct mm_heap_s *heap)
{
/* Nope, this is the last reference held by the current task. */
mseminfo("PID=%d giving\n", my_pid);
mseminfo("PID=%d giving\n", getpid());
heap->mm_holder = NO_HOLDER;
heap->mm_counts_held = 0;