diff options
| author | Ryo Nakamura <upa@haeena.net> | 2024-02-04 18:39:19 +0900 |
|---|---|---|
| committer | Ryo Nakamura <upa@haeena.net> | 2024-02-04 20:23:08 +0900 |
| commit | c95e6a4fffe935330b4018e49f95fff5ad2cc551 (patch) | |
| tree | 0620e4e817fa2c381f42f7d2ec4234061c0f07c1 /src/message.h | |
| parent | 304e71d5a0420c5293d233add7408a21c173ddfd (diff) | |
do not passing msg_fp via mscp opts
instead, mpr_* functions print messages to stdout or stderr directly.
Diffstat (limited to 'src/message.h')
| -rw-r--r-- | src/message.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/message.h b/src/message.h index 673f45c..a92d760 100644 --- a/src/message.h +++ b/src/message.h @@ -11,24 +11,24 @@ void mprint_set_severity(int severity); int mprint_get_severity(); -#define mprint(fp, severity, fmt, ...) \ - do { \ - if (fp && severity <= mprint_get_severity()) { \ - fprintf(fp, fmt, ##__VA_ARGS__); \ - fflush(fp); \ - } \ +#define mprint(fp, severity, fmt, ...) \ + do { \ + if (severity <= mprint_get_severity()) { \ + fprintf(fp, "\r\033[K" fmt "\n", ##__VA_ARGS__); \ + fflush(fp); \ + } \ } while (0) -#define mpr_err(fp, fmt, ...) \ - mprint(fp, MSCP_SEVERITY_ERR, fmt, ##__VA_ARGS__) -#define mpr_warn(fp, fmt, ...) \ - mprint(fp, MSCP_SEVERITY_WARN, fmt, ##__VA_ARGS__) -#define mpr_notice(fp, fmt, ...) \ - mprint(fp, MSCP_SEVERITY_NOTICE, fmt, ##__VA_ARGS__) -#define mpr_info(fp, fmt, ...) \ - mprint(fp, MSCP_SEVERITY_INFO, fmt, ##__VA_ARGS__) -#define mpr_debug(fp, fmt, ...) \ - mprint(fp, MSCP_SEVERITY_DEBUG, fmt, ##__VA_ARGS__) +#define mpr_err(fmt, ...) \ + mprint(stderr, MSCP_SEVERITY_ERR, fmt, ##__VA_ARGS__) +#define mpr_warn(fmt, ...) \ + mprint(stderr, MSCP_SEVERITY_WARN, fmt, ##__VA_ARGS__) +#define mpr_notice(fmt, ...) \ + mprint(stdout, MSCP_SEVERITY_NOTICE, fmt, ##__VA_ARGS__) +#define mpr_info(fmt, ...) \ + mprint(stdout, MSCP_SEVERITY_INFO, fmt, ##__VA_ARGS__) +#define mpr_debug(fmt, ...) \ + mprint(stdout, MSCP_SEVERITY_DEBUG, fmt, ##__VA_ARGS__) /* errorno wrapper */ |