tree-wide: remove unnecessary LOG_PRI

LOG_DEBUG is already a log level, there is no need to use LOG_PRI which
is for filtering out the facility.

diff --git a/src/core/execute.c b/src/core/execute.c
index 51e1e872369a15fb2c79ff6af77838b04ed237c6..0af4227b0e767ba00bea11bfd46616c35c37dac5 100644 (file)
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -797,7 +797,7 @@ static int setup_pam(
          * daemon. We do things this way to ensure that the main PID
          * of the daemon is the one we initially fork()ed. */
 
          * daemon. We do things this way to ensure that the main PID
          * of the daemon is the one we initially fork()ed. */
 

-        if (log_get_max_level() < LOG_PRI(LOG_DEBUG))
+        if (log_get_max_level() < LOG_DEBUG)

                 flags |= PAM_SILENT;
 
         pam_code = pam_start(name, user, &conv, &handle);
                 flags |= PAM_SILENT;
 
         pam_code = pam_start(name, user, &conv, &handle);


@@ -1782,7 +1782,7 @@ static int exec_child(ExecCommand *command,
 
         final_env = strv_env_clean(final_env);
 
 
         final_env = strv_env_clean(final_env);
 

-        if (_unlikely_(log_get_max_level() >= LOG_PRI(LOG_DEBUG))) {
+        if (_unlikely_(log_get_max_level() >= LOG_DEBUG)) {

                 _cleanup_free_ char *line;
 
                 line = exec_command_line(final_argv);
                 _cleanup_free_ char *line;
 
                 line = exec_command_line(final_argv);

diff --git a/src/journal/coredumpctl.c b/src/journal/coredumpctl.c
index 756e793a4fed14bea20771f5e38ed7a8248fae44..afb39ad035cb871e67b99e9f423821542bd59c2d 100644 (file)
--- a/src/journal/coredumpctl.c
+++ b/src/journal/coredumpctl.c
@@ -822,7 +822,7 @@ int main(int argc, char *argv[]) {
                 }
         }
 
                 }
         }
 

-        if (_unlikely_(log_get_max_level() >= LOG_PRI(LOG_DEBUG))) {
+        if (_unlikely_(log_get_max_level() >= LOG_DEBUG)) {

                 _cleanup_free_ char *filter;
 
                 filter = journal_make_match_string(j);
                 _cleanup_free_ char *filter;
 
                 filter = journal_make_match_string(j);

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index c91f2cf93845e06a33d4c5a79adf08c3f32c0c07..386e3505c044ed385f4049e54e126ff16321b86b 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1875,7 +1875,7 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
                 return EXIT_FAILURE;
         }
 

-        if (_unlikely_(log_get_max_level() >= LOG_PRI(LOG_DEBUG))) {
+        if (_unlikely_(log_get_max_level() >= LOG_DEBUG)) {

                 _cleanup_free_ char *filter;
 
                 filter = journal_make_match_string(j);
                 _cleanup_free_ char *filter;
 
                 filter = journal_make_match_string(j);

diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 98972eda3b08ef977ef245f6f2e8f868967c9f65..dff0d30d71b2378ead6918448d53c6e2ac771660 100644 (file)
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -1263,7 +1263,7 @@ int show_journal_by_unit(
         if (r < 0)
                 return r;
 
         if (r < 0)
                 return r;
 

-        if (_unlikely_(log_get_max_level() >= LOG_PRI(LOG_DEBUG))) {
+        if (_unlikely_(log_get_max_level() >= LOG_DEBUG)) {

                 _cleanup_free_ char *filter;
 
                 filter = journal_make_match_string(j);
                 _cleanup_free_ char *filter;
 
                 filter = journal_make_match_string(j);