-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Thomas Applencourt
committed
Oct 18, 2023
1 parent
209828a
commit ef27087
Showing
3 changed files
with
68 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
diff --git a/src/plugins/ctf/common/msg-iter/msg-iter.cpp b/src/plugins/ctf/common/msg-iter/msg-iter.cpp | ||
index eed75853..e314e38e 100644 | ||
--- a/src/plugins/ctf/common/msg-iter/msg-iter.cpp | ||
+++ b/src/plugins/ctf/common/msg-iter/msg-iter.cpp | ||
@@ -1909,11 +1909,6 @@ static enum bt_bfcr_status bfcr_unsigned_int_char_cb(uint64_t value, struct ctf_ | ||
goto end; | ||
} | ||
|
||
- if (value == 0) { | ||
- msg_it->done_filling_string = true; | ||
- goto end; | ||
- } | ||
- | ||
string_field = stack_top(msg_it->stack)->base; | ||
BT_ASSERT_DBG(bt_field_get_class_type(string_field) == BT_FIELD_CLASS_TYPE_STRING); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/src/common/gen-version-i.sh b/src/common/gen-version-i.sh | ||
index 938d70c5..a8249d47 100755 | ||
--- a/src/common/gen-version-i.sh | ||
+++ b/src/common/gen-version-i.sh | ||
@@ -42,7 +42,7 @@ fi | ||
# configurations leading to different results. | ||
if test -r "$TOP_SRCDIR/bootstrap" && test -r "$TOP_SRCDIR/.git" && | ||
(command -v git > /dev/null 2>&1); then | ||
- GIT_VERSION_STR="$(cd "$TOP_SRCDIR" && git describe --tags --dirty --abbrev=12)" | ||
+ GIT_VERSION_STR="$(cd "$TOP_SRCDIR" && git describe --tags --dirty --abbrev=12 --always)" | ||
GIT_CURRENT_TAG="$(cd "$TOP_SRCDIR" && (git describe --tags --exact-match --match="v[0-9]*" HEAD || true) 2> /dev/null)" | ||
echo "#define BT_VERSION_GIT \"$GIT_VERSION_STR\"" > version.i.tmp | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters