Attachment 846281 Details for Bug 1048384 – patch

patch

0001-Make-some-warnings-debug-statements.patch (text/x-c), 3.64 KB, created by Jon McCann on 2014-01-06 19:15:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jon McCann

Created: 2014-01-06 19:15:59 UTC

Size: 3.64 KB

patch

obsolete

>From 198b198bab5f7786ae719f2ae2b74dced87ddfd6 Mon Sep 17 00:00:00 2001
>From: William Jon McCann <william.jon.mccann@gmail.com>
>Date: Mon, 6 Jan 2014 14:12:47 -0500
>Subject: [PATCH] Make some warnings debug statements
>
>Since they appear to be triggered during normal operations
>regularly.
>---
> src/include/internal_libreport.h |  1 +
> src/lib/dump_dir.c               | 12 ++++++------
> 2 files changed, 7 insertions(+), 6 deletions(-)
>
>diff --git a/src/include/internal_libreport.h b/src/include/internal_libreport.h
>index e6d3150..5992e68 100644
>--- a/src/include/internal_libreport.h
>+++ b/src/include/internal_libreport.h
>@@ -492,6 +492,7 @@ void die_out_of_memory(void) NORETURN;
> #define perror_msg(...)         log_wrapper(LOG_ERR, __FILE__, __LINE__, __func__, true, true, __VA_ARGS__)
> #define warn_msg(...)           log_wrapper(LOG_WARNING, __FILE__, __LINE__, __func__, false, true, __VA_ARGS__)
> #define pwarn_msg(...)          log_wrapper(LOG_WARNING, __FILE__, __LINE__, __func__, true, true, __VA_ARGS__)
>+#define pdebug_msg(...)          log_wrapper(LOG_DEBUG, __FILE__, __LINE__, __func__, true, true, __VA_ARGS__)
> #define error_msg_and_die(...)  log_and_die_wrapper(LOG_ERR, __FILE__, __LINE__, __func__, false, true, __VA_ARGS__)
> #define perror_msg_and_die(...) log_and_die_wrapper(LOG_ERR, __FILE__, __LINE__, __func__, true, true, __VA_ARGS__)
> 
>diff --git a/src/lib/dump_dir.c b/src/lib/dump_dir.c
>index 28439af..999b45c 100644
>--- a/src/lib/dump_dir.c
>+++ b/src/lib/dump_dir.c
>@@ -122,7 +122,7 @@ static time_t parse_time_file(const char *filename)
>     int fd = open(filename, O_RDONLY | O_NOFOLLOW);
>     if (fd < 0)
>     {
>-        VERB2 pwarn_msg("Can't open '%s'", filename);
>+        VERB2 pdebug_msg("Can't open '%s'", filename);
>         return -1;
>     }
> 
>@@ -135,7 +135,7 @@ static time_t parse_time_file(const char *filename)
> 
>     if (rdsz == -1)
>     {
>-        VERB2 pwarn_msg("Can't read from '%s'", filename);
>+        VERB2 pdebug_msg("Can't read from '%s'", filename);
>         return -1;
>     }
>     /* approximate maximal number of digits in timestamp is sizeof(time_t)*3 */
>@@ -169,7 +169,7 @@ static time_t parse_time_file(const char *filename)
>      || val >= MAX_TIME_T
>      || !isdigit_str(time_buf) /* this filters out "-num", "   num", "" */
>     ) {
>-        VERB2 pwarn_msg("File '%s' doesn't contain valid unix "
>+        VERB2 pdebug_msg("File '%s' doesn't contain valid unix "
>                         "time stamp ('%s')", filename, time_buf);
>         return -1;
>     }
>@@ -251,7 +251,7 @@ static const char *dd_check(struct dump_dir *dd)
>     dd->dd_time = parse_time_file(filename_buf);
>     if (dd->dd_time < 0)
>     {
>-        log_warning("Missing file: "FILENAME_TIME);
>+        log_debug("Missing file: "FILENAME_TIME);
>         return FILENAME_TIME;
>     }
> 
>@@ -259,7 +259,7 @@ static const char *dd_check(struct dump_dir *dd)
>     dd->dd_type = load_text_file(filename_buf, DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE);
>     if (!dd->dd_type || (strlen(dd->dd_type) == 0))
>     {
>-        log_warning("Missing or empty file: "FILENAME_TYPE);
>+        log_debug("Missing or empty file: "FILENAME_TYPE);
>         return FILENAME_TYPE;
>     }
> 
>@@ -305,7 +305,7 @@ static int dd_lock(struct dump_dir *dd, unsigned sleep_usec, int flags)
>         if (missing_file)
>         {
>             xunlink(lock_buf);
>-            log_warning("Unlocked '%s' (no or corrupted '%s' file)", lock_buf, missing_file);
>+            log_debug("Unlocked '%s' (no or corrupted '%s' file)", lock_buf, missing_file);
>             if (--count == 0 || flags & DD_DONT_WAIT_FOR_LOCK)
>             {
>                 errno = EISDIR; /* "this is an ordinary dir, not dump dir" */
>-- 
>1.8.4.2
>

Actions: View

Attachments on bug 1048384: 846280 | 846281