[libdmapsharing] Another adjustment to assertions checking return and error



commit 740e4ff72e9a67568646f4c8ddc6b166fe1162e7
Author: W. Michael Petullo <mike flyn org>
Date:   Wed Jul 18 21:50:17 2018 -0400

    Another adjustment to assertions checking return and error
    
    Signed-off-by: W. Michael Petullo <mike flyn org>

 libdmapsharing/dmap-record-factory.c | 4 ++--
 libdmapsharing/dmap-share.c          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/libdmapsharing/dmap-record-factory.c b/libdmapsharing/dmap-record-factory.c
index 5b492c9..bfaabd2 100644
--- a/libdmapsharing/dmap-record-factory.c
+++ b/libdmapsharing/dmap-record-factory.c
@@ -37,8 +37,8 @@ dmap_record_factory_create (DmapRecordFactory *factory,
                                   user_data,
                                   error);
 
-       g_assert((NULL == record && NULL != *error)
-             || (NULL != record && NULL == *error));
+       g_assert((NULL == record && (NULL == error || NULL != *error))
+             || (NULL != record && (NULL == error || NULL == *error)));
 
        return record;
 }
diff --git a/libdmapsharing/dmap-share.c b/libdmapsharing/dmap-share.c
index a1c3a0e..c4602a4 100644
--- a/libdmapsharing/dmap-share.c
+++ b/libdmapsharing/dmap-share.c
@@ -321,8 +321,8 @@ dmap_share_serve (DmapShare *share, GError **error)
        ok = TRUE;
 
 done:
-       g_assert((FALSE == ok && NULL != error)
-             || (TRUE  == ok && NULL == error));
+       g_assert((!ok && (NULL == error || NULL != *error))
+             || ( ok && (NULL == error || NULL == *error)));
 
        return ok;
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]