From: Joel Rosdahl <joel@rosdahl.net>
Date: Sat, 16 Jan 2021 18:09:10 +0000 (+0100)
Subject: Remove superfluous file_language member from ArgumentProcessingState
X-Git-Tag: v4.2~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=35ff5e2da9865a5828cdd01c20aa12c415db32ee;p=thirdparty%2Fccache.git

Remove superfluous file_language member from ArgumentProcessingState
---

diff --git a/src/argprocessing.cpp b/src/argprocessing.cpp
index 330dc0eac..fb77414fe 100644
--- a/src/argprocessing.cpp
+++ b/src/argprocessing.cpp
@@ -48,7 +48,6 @@ struct ArgumentProcessingState
   bool found_rewrite_includes = false;
 
   std::string explicit_language;    // As specified with -x.
-  std::string file_language;        // As deduced from file extension.
   std::string input_charset_option; // -finput-charset=...
 
   // Is the dependency makefile name overridden with -MF?
@@ -993,7 +992,6 @@ process_args(Context& ctx)
   if (!state.explicit_language.empty() && state.explicit_language == "none") {
     state.explicit_language.clear();
   }
-  state.file_language = language_for_file(args_info.input_file);
   if (!state.explicit_language.empty()) {
     if (!language_is_supported(state.explicit_language)) {
       LOG("Unsupported language: {}", state.explicit_language);
@@ -1001,7 +999,7 @@ process_args(Context& ctx)
     }
     args_info.actual_language = state.explicit_language;
   } else {
-    args_info.actual_language = state.file_language;
+    args_info.actual_language = language_for_file(args_info.input_file);
   }
 
   args_info.output_is_precompiled_header =