From df19468eca6fa272ae8c0753eb33c6f3f027d77b Mon Sep 17 00:00:00 2001 From: Nate Bradac Date: Sun, 11 Aug 2024 20:33:04 -0500 Subject: [PATCH] [C] fix compliation error in C string view functions --- .../co/real_logic/sbe/generation/c/CGenerator.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/c/CGenerator.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/c/CGenerator.java index 7e597141fd..68afbb8283 100755 --- a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/c/CGenerator.java +++ b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/c/CGenerator.java @@ -613,7 +613,7 @@ private CharSequence generateVarData( " return ret;\n" + "}\n", propertyName, - generateStringViewNotPresentCondition(token.version()), + generateStringViewNotPresentCondition(token.version(), outermostStruct), lengthOfLengthField, lengthCType, structName, @@ -1032,7 +1032,9 @@ private static CharSequence generateArrayFieldNotPresentCondition(final int sinc sinceVersion); } - private static CharSequence generateStringViewNotPresentCondition(final int sinceVersion) + private static CharSequence generateStringViewNotPresentCondition( + final int sinceVersion, + final String outermostStruct) { if (0 == sinceVersion) { @@ -1042,9 +1044,11 @@ private static CharSequence generateStringViewNotPresentCondition(final int sinc return String.format( " if (codec->acting_version < %1$d)\n" + " {\n" + - " return { NULL, 0 };\n" + + " struct %2$s_string_view ret = { NULL, 0 };\n" + + " return ret;\n" + " }\n\n", - sinceVersion); + sinceVersion, + outermostStruct); } private static CharSequence generateTypeFieldNotPresentCondition(final int sinceVersion)