Snap for 8992082 from 8bfcaf9ebfeefe4daaa55095be49f6db49a7e704 to gki13-boot-releasegki13-boot-release

Change-Id: I5ce2bcddb71283ff63853f0e94287698b2c73a3c

1 files changed, 6 insertions, 6 deletions

diff --git a/tools/cfg/cfg.cpp b/tools/cfg/cfg.cpp
index a93488d5..5380c21e 100644
--- a/tools/cfg/cfg.cpp
+++ b/tools/cfg/cfg.cpp
@@ -44,7 +44,7 @@ Options:
       argv0, argv0);
 }
 
-static const auto kDefaultEnvironment = SPV_ENV_UNIVERSAL_1_5;
+static const auto kDefaultEnvironment = SPV_ENV_UNIVERSAL_1_6;
 
 int main(int argc, char** argv) {
   const char* inFile = nullptr;
@@ -69,16 +69,16 @@ int main(int argc, char** argv) {
           if (0 == strcmp(argv[argi], "--help")) {
             print_usage(argv[0]);
             return 0;
-          } else if (0 == strcmp(argv[argi], "--version")) {
+          }
+          if (0 == strcmp(argv[argi], "--version")) {
             printf("%s EXPERIMENTAL\n", spvSoftwareVersionDetailsString());
             printf("Target: %s\n",
                    spvTargetEnvDescription(kDefaultEnvironment));
             return 0;
-          } else {
-            print_usage(argv[0]);
-            return 1;
           }
-        } break;
+          print_usage(argv[0]);
+          return 1;
+        }
         case 0: {
           // Setting a filename of "-" to indicate stdin.
           if (!inFile) {