From b7b9361f7d7eff4f6982843195b982cd7c055877 Mon Sep 17 00:00:00 2001
From: mjpt777 <mjpt777@gmail.com>
Date: Thu, 14 Jan 2021 12:06:53 +0000
Subject: [PATCH] Fix Warnings.

---
 csharp/sbe-dll/sbe-tool.sh                     | 16 ++++++++--------
 gocode/sbe-tool                                | 18 +++++++++---------
 .../java/uk/co/real_logic/sbe/xml/SetType.java |  2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/csharp/sbe-dll/sbe-tool.sh b/csharp/sbe-dll/sbe-tool.sh
index a31127964d..d2fcf8c7f3 100644
--- a/csharp/sbe-dll/sbe-tool.sh
+++ b/csharp/sbe-dll/sbe-tool.sh
@@ -4,10 +4,10 @@ ROOTDIR=`dirname $0`
 SBE_JAR=$ROOTDIR/sbe-tool-all.jar
 
 
-[ -f $SBE_JAR ] || (echo "Missing $SBE_JAR"; exit 1)
+[ -f "$SBE_JAR" ] || (echo "Missing $SBE_JAR"; exit 1)
 
 function usage {
-    echo usage: `basename $0` [-d output_dir] -s schema
+    echo usage: $(basename "$0")  [-d output_dir] -s schema
 }
 
 # defaults
@@ -22,7 +22,7 @@ while getopts "d:s:" OPT "$@"; do
         SCHEMA=$OPTARG
         ;;
     *)
-        echo $OPT
+        echo "$OPT"
         usage
         exit 1
         ;;
@@ -31,12 +31,12 @@ done
 shift $(($OPTIND - 1))
 
 # Check args
-if [ -z $SCHEMA ]; then usage; exit 1; fi
-if [ ! -f $SCHEMA ]; then echo no schema at $SCHEMA; exit 1; fi
+if [ -z "$SCHEMA" ]; then usage; exit 1; fi
+if [ ! -f "$SCHEMA" ]; then echo no schema at "$SCHEMA"; exit 1; fi
 
 java \
--Dsbe.output.dir=$OUTPUTDIR \
+-Dsbe.output.dir="$OUTPUTDIR" \
 -Dsbe.generate.ir="false" \
 -Dsbe.target.language="uk.co.real_logic.sbe.generation.csharp.CSharp" \
--jar $SBE_JAR \
-$SCHEMA
+-jar "$SBE_JAR" \
+"$SCHEMA"
diff --git a/gocode/sbe-tool b/gocode/sbe-tool
index def3aae312..61e4c903e1 100755
--- a/gocode/sbe-tool
+++ b/gocode/sbe-tool
@@ -1,13 +1,13 @@
 #! /usr/bin/env bash
 
-ROOTDIR=`dirname $0`/..
-SBE_TOOL_VERSION=`cat $ROOTDIR/version.txt`
+ROOTDIR=$(dirname "$0")/..
+SBE_TOOL_VERSION=$(cat "$ROOTDIR"/version.txt)
 SBE_JAR=$ROOTDIR/sbe-all/build/libs/sbe-all-$SBE_TOOL_VERSION.jar
 
 [ -f $SBE_JAR ] || (echo "Missing $SBE_JAR. Run gradle first"; exit 1)
 
 function usage {
-    echo usage: `basename $0` [-d output_dir] -s schema
+    echo usage: $(basename "$0") [-d output_dir] -s schema
 }
 
 # defaults
@@ -22,7 +22,7 @@ while getopts "d:s:" OPT "$@"; do
         SCHEMA=$OPTARG
         ;;
     *)
-        echo $OPT
+        echo "$OPT"
         usage
         exit 1
         ;;
@@ -31,12 +31,12 @@ done
 shift $(($OPTIND - 1))
 
 # Check args
-[ -z $SCHEMA ] && (usage; exit 1)
-[ -f $SCHEMA ] || (echo invalid schema $SCHEMA; exit 1)
+[ -z "$SCHEMA" ] && (usage; exit 1)
+[ -f "$SCHEMA" ] || (echo invalid schema "$SCHEMA"; exit 1)
 
 java \
--Dsbe.output.dir=$OUTPUTDIR \
+-Dsbe.output.dir="$OUTPUTDIR" \
 -Dsbe.generate.ir="false" \
 -Dsbe.target.language="golang" \
--jar $SBE_JAR \
-$SCHEMA
+-jar "$SBE_JAR" \
+"$SCHEMA"
diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/xml/SetType.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/xml/SetType.java
index b614b83ead..6dd1692734 100644
--- a/sbe-tool/src/main/java/uk/co/real_logic/sbe/xml/SetType.java
+++ b/sbe-tool/src/main/java/uk/co/real_logic/sbe/xml/SetType.java
@@ -221,7 +221,7 @@ public Choice(final Node node, final PrimitiveType encodingType)
             deprecated = Integer.parseInt(getAttributeValue(node, "deprecated", "0"));
 
             // choice values are bit positions (0, 1, 2, 3, 4, etc.) from LSB to MSB
-            if (value.longValue() >= (encodingType.size() * 8))
+            if (value.longValue() >= (encodingType.size() * 8L))
             {
                 throw new IllegalArgumentException("Choice value out of bounds: " + value.longValue());
             }