From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH BlueZ] log: Make error and warn log file and function information
Date: Wed, 29 Apr 2020 14:04:19 -0700 [thread overview]
Message-ID: <20200429210419.1569840-1-luiz.dentz@gmail.com> (raw)
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This makes it a lot simpler to find out where errors/warnings come from
and also remove the possibility of clashes when having multiple places
where the message would be exactly the same.
---
src/log.c | 26 --------------------------
src/log.h | 6 ++++--
2 files changed, 4 insertions(+), 28 deletions(-)
diff --git a/src/log.c b/src/log.c
index 11d26d508..a42c5941d 100644
--- a/src/log.c
+++ b/src/log.c
@@ -53,32 +53,6 @@ static void monitor_log(uint16_t index, int priority,
bt_log_vprintf(index, LOG_IDENT, priority, format, ap);
}
-void error(const char *format, ...)
-{
- va_list ap;
-
- va_start(ap, format);
- vsyslog(LOG_ERR, format, ap);
- va_end(ap);
-
- va_start(ap, format);
- monitor_log(HCI_DEV_NONE, LOG_ERR, format, ap);
- va_end(ap);
-}
-
-void warn(const char *format, ...)
-{
- va_list ap;
-
- va_start(ap, format);
- vsyslog(LOG_WARNING, format, ap);
- va_end(ap);
-
- va_start(ap, format);
- monitor_log(HCI_DEV_NONE, LOG_WARNING, format, ap);
- va_end(ap);
-}
-
void info(const char *format, ...)
{
va_list ap;
diff --git a/src/log.h b/src/log.h
index 0d243ceca..73240e259 100644
--- a/src/log.h
+++ b/src/log.h
@@ -23,8 +23,6 @@
#include <stdint.h>
-void error(const char *format, ...) __attribute__((format(printf, 1, 2)));
-void warn(const char *format, ...) __attribute__((format(printf, 1, 2)));
void info(const char *format, ...) __attribute__((format(printf, 1, 2)));
void btd_log(uint16_t index, int priority, const char *format, ...)
@@ -71,3 +69,7 @@ void __btd_enable_debug(struct btd_debug_desc *start,
} while (0)
#define DBG(fmt, arg...) DBG_IDX(0xffff, fmt, ## arg)
+#define error(fmt, arg...) \
+ btd_error(0xffff, "%s:%s() " fmt, __FILE__, __func__ , ## arg)
+#define warn(fmt, arg...) \
+ btd_warn(0xffff, "%s:%s() " fmt, __FILE__, __func__ , ## arg)
--
2.25.3
next reply other threads:[~2020-04-29 21:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-29 21:04 Luiz Augusto von Dentz [this message]
2020-04-29 21:35 ` [BlueZ] log: Make error and warn log file and function information bluez.test.bot
2020-04-29 22:16 [PATCH BlueZ] " Luiz Augusto von Dentz
2020-05-01 22:05 ` Luiz Augusto von Dentz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200429210419.1569840-1-luiz.dentz@gmail.com \
--to=luiz.dentz@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).