X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fctf-writer%2Fresolve.c;h=56ecc1e0345a5f66a71d7a52d577665633812cc3;hb=a79c4ac935ed9fe764f89dcb81135b7d78d806e4;hp=4636e1c55348786ec6122624ba5cc94244606980;hpb=198f26cdfd3effd3272eaf238b3d4a437b6621e9;p=babeltrace.git

diff --git a/src/ctf-writer/resolve.c b/src/ctf-writer/resolve.c
index 4636e1c5..56ecc1e0 100644
--- a/src/ctf-writer/resolve.c
+++ b/src/ctf-writer/resolve.c
@@ -683,7 +683,7 @@ struct bt_ctf_field_path *pathstr_to_field_path(const char *pathstr,
 		GString *field_path_pretty =
 			bt_ctf_field_path_string(field_path);
 		const char *field_path_pretty_str =
-			field_path_pretty ? field_path_pretty->str : NULL;
+			field_path_pretty ? field_path_pretty->str : "(null)";
 
 		BT_LOGT("Found field path: path=\"%s\", field-path=\"%s\"",
 			pathstr, field_path_pretty_str);
@@ -806,9 +806,9 @@ int get_field_paths_lca_index(struct bt_ctf_field_path *field_path1,
 		GString *field_path2_pretty =
 			bt_ctf_field_path_string(field_path2);
 		const char *field_path1_pretty_str =
-			field_path1_pretty ? field_path1_pretty->str : NULL;
+			field_path1_pretty ? field_path1_pretty->str : "(null)";
 		const char *field_path2_pretty_str =
-			field_path2_pretty ? field_path2_pretty->str : NULL;
+			field_path2_pretty ? field_path2_pretty->str : "(null)";
 
 		BT_LOGT("Finding lowest common ancestor (LCA) between two field paths: "
 			"field-path-1=\"%s\", field-path-2=\"%s\"",
@@ -975,7 +975,7 @@ int validate_target_field_path(struct bt_ctf_field_path *target_field_path,
 		}
 		break;
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 end:
@@ -1012,7 +1012,7 @@ int resolve_sequence_or_variant_type(struct bt_ctf_field_type_common *type,
 			bt_ctf_field_type_common_variant_get_tag_name(type);
 		break;
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 	if (!pathstr) {
@@ -1087,7 +1087,7 @@ int resolve_sequence_or_variant_type(struct bt_ctf_field_type_common *type,
 		}
 		break;
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 end: