diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-04-10 07:35:47 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-04-10 18:09:32 +0200 |
| commit | 1eaddced105a7e04b571f772cc67b0d16178d092 (patch) | |
| tree | ba2ba4f37835d9d04818aae6ce5b22439c6657f2 | |
| parent | 63593a19d8e7d7fb5e844f0e3c8ac847e68699cb (diff) | |
| download | NetworkManager-1eaddced105a7e04b571f772cc67b0d16178d092.tar.gz | |
make use of NM_MORE_ASSERTS, nm_assert() and NM_MORE_LOGGING
| -rw-r--r-- | libnm-core/nm-utils.c | 8 | ||||
| -rw-r--r-- | src/nm-route-manager.c | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index d3557f578a..460408d2b2 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -3379,11 +3379,9 @@ _nm_utils_ascii_str_to_int64 (const char *str, guint base, gint64 min, gint64 ma memcpy (s, str, len); s[len] = 0; - /* - g_assert (len > 0 && len < strlen (str) && len == strlen (s)); - g_assert (!g_ascii_isspace (str[len-1]) && g_ascii_isspace (str[len])); - g_assert (strncmp (str, s, len) == 0); - */ + nm_assert (len > 0 && len < strlen (str) && len == strlen (s)); + nm_assert (!g_ascii_isspace (str[len-1]) && g_ascii_isspace (str[len])); + nm_assert (strncmp (str, s, len) == 0); str = s; } diff --git a/src/nm-route-manager.c b/src/nm-route-manager.c index 219bbbb346..d97b896d88 100644 --- a/src/nm-route-manager.c +++ b/src/nm-route-manager.c @@ -28,8 +28,6 @@ #include "gsystem-local-alloc.h" #include "NetworkManagerUtils.h" -//#define DEBUG_ROUTE_MANAGER - typedef struct { guint len; NMPlatformIPXRoute *entries[1]; @@ -110,7 +108,7 @@ static const VTableIP vtable_v4, vtable_v6; nm_logging_enabled (__level, __domain); \ }) -#ifdef DEBUG_ROUTE_MANAGER +#ifdef NM_MORE_LOGGING #define _LOGT_ENABLED(addr_family) _LOG_LEVEL_ENABLED (LOGL_TRACE, addr_family) #define _LOGT(addr_family, ...) _LOG (LOGL_TRACE, addr_family, __VA_ARGS__) #else @@ -125,7 +123,7 @@ static const VTableIP vtable_v4, vtable_v6; /*********************************************************************************************/ -#if defined (DEBUG_ROUTE_MANAGER) && !defined (G_DISABLE_ASSERT) +#if defined (NM_MORE_ASSERTS) && !defined (G_DISABLE_ASSERT) inline static void ASSERT_route_index_valid (const VTableIP *vtable, const GArray *entries, const RouteIndex *index, gboolean unique_ifindexes) { |