RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

core: replace RIOT_FILE_RELATIVE with __FILE__

Browse Source
This commit is contained in:
Benjamin Valentin 2022-11-19 01:42:51 +01:00
parent e0688991dd
commit 37116d359e
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/lib/include/assert.h
View File

@ -44,10 +44,6 @@ extern "C" {
#define DEBUG_ASSERT_VERBOSE #define DEBUG_ASSERT_VERBOSE
#endif #endif
#ifndef RIOT_FILE_RELATIVE
#define RIOT_FILE_RELATIVE (__FILE__)
#endif
/** /**
* @def __NORETURN * @def __NORETURN
* @brief hidden (__) NORETURN definition * @brief hidden (__) NORETURN definition
@ -110,8 +106,7 @@ __NORETURN void _assert_failure(const char *file, unsigned line);
* *
* @see http://pubs.opengroup.org/onlinepubs/9699919799/functions/assert.html * @see http://pubs.opengroup.org/onlinepubs/9699919799/functions/assert.html
*/ */
#define assert(cond) ((cond) ? (void)0 : _assert_failure(RIOT_FILE_RELATIVE, \ #define assert(cond) ((cond) ? (void)0 : _assert_failure(__FILE__, __LINE__))
__LINE__))
#else /* DEBUG_ASSERT_VERBOSE */ #else /* DEBUG_ASSERT_VERBOSE */
__NORETURN void _assert_panic(void); __NORETURN void _assert_panic(void);
#define assert(cond) ((cond) ? (void)0 : _assert_panic()) #define assert(cond) ((cond) ? (void)0 : _assert_panic())

6
core/msg.c
View File

@ -105,18 +105,18 @@ static int _msg_send(msg_t *m, kernel_pid_t target_pid, bool block,
thread_t *me = thread_get_active(); thread_t *me = thread_get_active();
DEBUG("msg_send() %s:%i: Sending from %" PRIkernel_pid " to %" PRIkernel_pid DEBUG("msg_send() %s:%i: Sending from %" PRIkernel_pid " to %" PRIkernel_pid
". block=%i src->state=%i target->state=%i\n", RIOT_FILE_RELATIVE, ". block=%i src->state=%i target->state=%i\n", __FILE__,
__LINE__, thread_getpid(), target_pid, __LINE__, thread_getpid(), target_pid,
block, (int)me->status, (int)target->status); block, (int)me->status, (int)target->status);
if (target->status != STATUS_RECEIVE_BLOCKED) { if (target->status != STATUS_RECEIVE_BLOCKED) {
DEBUG( DEBUG(
"msg_send() %s:%i: Target %" PRIkernel_pid " is not RECEIVE_BLOCKED.\n", "msg_send() %s:%i: Target %" PRIkernel_pid " is not RECEIVE_BLOCKED.\n",
RIOT_FILE_RELATIVE, __LINE__, target_pid); __FILE__, __LINE__, target_pid);
if (queue_msg(target, m)) { if (queue_msg(target, m)) {
DEBUG("msg_send() %s:%i: Target %" PRIkernel_pid DEBUG("msg_send() %s:%i: Target %" PRIkernel_pid
" has a msg_queue. Queueing message.\n", RIOT_FILE_RELATIVE, " has a msg_queue. Queueing message.\n", __FILE__,
__LINE__, target_pid); __LINE__, target_pid);
irq_restore(state); irq_restore(state);
if (me->status == STATUS_REPLY_BLOCKED if (me->status == STATUS_REPLY_BLOCKED