Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-30 08:07:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

log: use BIT() instead of 1 <<

Browse source 
Use the BIT() macro when creating a bitmask for the logging fields.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Heinrich Schuchardt 2020-06-17 21:52:45 +02:00 • committed by Simon Glass
parent 3c21d7738a
commit dde173a204
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
common/log_console.c
View file

@ -25,18 +25,18 @@ static int log_console_emit(struct log_device *ldev, struct log_rec *rec)
* - function is an identifier and ends with () * - function is an identifier and ends with ()
* - message has a space before it unless it is on its own * - message has a space before it unless it is on its own
*/ */
if (fmt & (1 << LOGF_LEVEL)) if (fmt & BIT(LOGF_LEVEL))
printf("%s.", log_get_level_name(rec->level)); printf("%s.", log_get_level_name(rec->level));
if (fmt & (1 << LOGF_CAT)) if (fmt & BIT(LOGF_CAT))
printf("%s,", log_get_cat_name(rec->cat)); printf("%s,", log_get_cat_name(rec->cat));
if (fmt & (1 << LOGF_FILE)) if (fmt & BIT(LOGF_FILE))
printf("%s:", rec->file); printf("%s:", rec->file);
if (fmt & (1 << LOGF_LINE)) if (fmt & BIT(LOGF_LINE))
printf("%d-", rec->line); printf("%d-", rec->line);
if (fmt & (1 << LOGF_FUNC)) if (fmt & BIT(LOGF_FUNC))
printf("%s()", rec->func); printf("%s()", rec->func);
if (fmt & (1 << LOGF_MSG)) if (fmt & BIT(LOGF_MSG))
printf("%s%s", fmt != (1 << LOGF_MSG) ? " " : "", rec->msg); printf("%s%s", fmt != BIT(LOGF_MSG) ? " " : "", rec->msg);
return 0; return 0;
} }

14
common/log_syslog.c
View file

@ -82,21 +82,21 @@ static int log_syslog_emit(struct log_device *ldev, struct log_rec *rec)
if (log_hostname) if (log_hostname)
append(&ptr, msg_end, "%s ", log_hostname); append(&ptr, msg_end, "%s ", log_hostname);
append(&ptr, msg_end, "uboot: "); append(&ptr, msg_end, "uboot: ");
if (fmt & (1 << LOGF_LEVEL)) if (fmt & BIT(LOGF_LEVEL))
append(&ptr, msg_end, "%s.", append(&ptr, msg_end, "%s.",
log_get_level_name(rec->level)); log_get_level_name(rec->level));
if (fmt & (1 << LOGF_CAT)) if (fmt & BIT(LOGF_CAT))
append(&ptr, msg_end, "%s,", append(&ptr, msg_end, "%s,",
log_get_cat_name(rec->cat)); log_get_cat_name(rec->cat));
if (fmt & (1 << LOGF_FILE)) if (fmt & BIT(LOGF_FILE))
append(&ptr, msg_end, "%s:", rec->file); append(&ptr, msg_end, "%s:", rec->file);
if (fmt & (1 << LOGF_LINE)) if (fmt & BIT(LOGF_LINE))
append(&ptr, msg_end, "%d-", rec->line); append(&ptr, msg_end, "%d-", rec->line);
if (fmt & (1 << LOGF_FUNC)) if (fmt & BIT(LOGF_FUNC))
append(&ptr, msg_end, "%s()", rec->func); append(&ptr, msg_end, "%s()", rec->func);
if (fmt & (1 << LOGF_MSG)) if (fmt & BIT(LOGF_MSG))
append(&ptr, msg_end, "%s%s", append(&ptr, msg_end, "%s%s",
fmt != (1 << LOGF_MSG) ? " " : "", rec->msg); fmt != BIT(LOGF_MSG) ? " " : "", rec->msg);
/* Consider trailing 0x00 */ /* Consider trailing 0x00 */
ptr++; ptr++;