doczkal / rpms / abrt

Forked from rpms/abrt 4 years ago
Clone

Blame SOURCES/0160-dbus-api-unify-reporting-of-errors.patch

47a88a
From c4ed648911bf4fb7b5c2c9596bd2418f4f836e00 Mon Sep 17 00:00:00 2001
47a88a
From: Jakub Filak <jfilak@redhat.com>
47a88a
Date: Tue, 11 Aug 2015 09:54:55 +0200
47a88a
Subject: [PATCH] dbus-api: unify reporting of errors
47a88a
47a88a
User ERR_PTR for failures in all functions because some of the functions
47a88a
use NULL as a valid response (NULL is an empty GList).
47a88a
47a88a
Related: rhbz#1224984
47a88a
47a88a
Signed-off-by: Jakub Filak <jfilak@redhat.com>
47a88a
---
47a88a
 src/include/libabrt.h      | 12 +++++++-----
47a88a
 src/lib/problem_api_dbus.c |  2 +-
47a88a
 2 files changed, 8 insertions(+), 6 deletions(-)
47a88a
47a88a
diff --git a/src/include/libabrt.h b/src/include/libabrt.h
47a88a
index 5d74aa3..3b17a64 100644
47a88a
--- a/src/include/libabrt.h
47a88a
+++ b/src/include/libabrt.h
47a88a
@@ -135,7 +135,7 @@ void koops_print_suspicious_strings_filtered(const regex_t **filterout);
47a88a
 
47a88a
   Requires authorization
47a88a
 
47a88a
-  @return 0 if successfull non-zeru on failure
47a88a
+  @return 0 if successful; non-zero on failure
47a88a
 */
47a88a
 int chown_dir_over_dbus(const char *problem_dir_path);
47a88a
 
47a88a
@@ -161,7 +161,8 @@ char *load_text_over_dbus(const char *problem_id, const char *element_name);
47a88a
  @brief Delets multiple problems specified by their id (as returned from problem_data_save)
47a88a
 
47a88a
  @param problem_dir_paths List of problem ids
47a88a
- @return 0 if operation was successfull, non-zero on failure
47a88a
+
47a88a
+ @return 0 if operation was successful, non-zero on failure
47a88a
 */
47a88a
 
47a88a
 int delete_problem_dirs_over_dbus(const GList *problem_dir_paths);
47a88a
@@ -169,14 +170,14 @@ int delete_problem_dirs_over_dbus(const GList *problem_dir_paths);
47a88a
 /**
47a88a
   @brief Fetches problem information for specified problem id
47a88a
 
47a88a
-  @return problem_data_t or NULL on failure
47a88a
+  @return a valid pointer to problem_data_t or ERR_PTR on failure
47a88a
 */
47a88a
 problem_data_t *get_problem_data_dbus(const char *problem_dir_path);
47a88a
 
47a88a
 /**
47a88a
   @brief Fetches full problem data for specified problem id
47a88a
 
47a88a
-  @return problem_data_t or ERR_PTR on failure
47a88a
+  @return a valid pointer to problem_data_t or ERR_PTR on failure
47a88a
 */
47a88a
 problem_data_t *get_full_problem_data_over_dbus(const char *problem_dir_path);
47a88a
 
47a88a
@@ -184,7 +185,8 @@ problem_data_t *get_full_problem_data_over_dbus(const char *problem_dir_path);
47a88a
   @brief Fetches all problems from problem database
47a88a
 
47a88a
   @param authorize If set to true will try to fetch even problems owned by other users (will require root authorization over policy kit)
47a88a
-  @return List of problem ids or NULL on failure
47a88a
+
47a88a
+  @return List of problem ids or ERR_PTR on failure (NULL is an empty list)
47a88a
 */
47a88a
 GList *get_problems_over_dbus(bool authorize);
47a88a
 
47a88a
diff --git a/src/lib/problem_api_dbus.c b/src/lib/problem_api_dbus.c
47a88a
index 5148932..dd06633 100644
47a88a
--- a/src/lib/problem_api_dbus.c
47a88a
+++ b/src/lib/problem_api_dbus.c
47a88a
@@ -132,7 +132,7 @@ problem_data_t *get_problem_data_dbus(const char *problem_dir_path)
47a88a
     {
47a88a
         error_msg(_("Can't get problem data from abrt-dbus: %s"), error->message);
47a88a
         g_error_free(error);
47a88a
-        return NULL;
47a88a
+        return ERR_PTR;
47a88a
     }
47a88a
 
47a88a
     problem_data_t *pd = problem_data_new();
47a88a
-- 
47a88a
2.4.3
47a88a