X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fcommon.h;h=ab19d098b37a693e3dbb318afe2cf1d09474b043;hb=98b15851a941e7342b8bb19e265cdc3a40fabfb8;hp=bad17b772a098ada59e0118567ae748e32e99043;hpb=81b8fa4490092c27f40470f1f50a925f768b7b83;p=babeltrace.git

diff --git a/src/common/common.h b/src/common/common.h
index bad17b77..ab19d098 100644
--- a/src/common/common.h
+++ b/src/common/common.h
@@ -372,10 +372,10 @@ ssize_t bt_common_read(int fd, void *buf, size_t count, int log_level)
 	size_t i = 0;
 	ssize_t ret;
 
-	BT_ASSERT(buf);
+	BT_ASSERT_DBG(buf);
 
 	/* Never return an overflow value. */
-	BT_ASSERT(count <= SSIZE_MAX);
+	BT_ASSERT_DBG(count <= SSIZE_MAX);
 
 	do {
 		ret = read(fd, buf + i, count - i);
@@ -398,7 +398,7 @@ ssize_t bt_common_read(int fd, void *buf, size_t count, int log_level)
 			}
 		}
 		i += ret;
-		BT_ASSERT(i <= count);
+		BT_ASSERT_DBG(i <= count);
 	} while (count - i > 0 && ret > 0);
 
 end:
@@ -443,20 +443,20 @@ const char *bt_common_field_class_type_string(enum bt_field_class_type class_typ
 		return "DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD";
 	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD:
 		return "DYNAMIC_ARRAY_WITH_LENGTH_FIELD";
-	case BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR:
-		return "OPTION_WITHOUT_SELECTOR";
-	case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR:
-		return "OPTION_WITH_BOOL_SELECTOR";
-	case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR:
-		return "OPTION_WITH_UNSIGNED_INTEGER_SELECTOR";
-	case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR:
-		return "OPTION_WITH_SIGNED_INTEGER_SELECTOR";
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR:
-		return "VARIANT_WITHOUT_SELECTOR";
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR:
-		return "VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR";
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR:
-		return "VARIANT_WITH_SIGNED_INTEGER_SELECTOR";
+	case BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD:
+		return "OPTION_WITHOUT_SELECTOR_FIELD";
+	case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD:
+		return "OPTION_WITH_BOOL_SELECTOR_FIELD";
+	case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD:
+		return "OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD";
+	case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD:
+		return "OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD";
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD:
+		return "VARIANT_WITHOUT_SELECTOR_FIELD";
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD:
+		return "VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD";
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD:
+		return "VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD";
 	default:
 		return "(unknown)";
 	}
@@ -567,7 +567,7 @@ GString *bt_common_field_path_string(struct bt_field_path *path)
 	GString *str = g_string_new(NULL);
 	uint64_t i;
 
-	BT_ASSERT(path);
+	BT_ASSERT_DBG(path);
 
 	if (!str) {
 		goto end;
@@ -667,7 +667,7 @@ int bt_common_clock_value_from_ns_from_origin(
 	uint64_t value_period_cycles;
 	int64_t ns_to_add;
 
-	BT_ASSERT(raw_value);
+	BT_ASSERT_DBG(raw_value);
 
 	/* Compute offset part of requested value, in nanoseconds */
 	if (!bt_safe_to_mul_int64(cc_offset_seconds, NS_PER_S_I)) {