Skip to content

Commit c08f704

Browse files
author
Daniel Kroening
committed
java_class_loadert: remove unused parameter
1 parent 8640288 commit c08f704

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

jbmc/src/java_bytecode/java_bytecode_language.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,7 @@ bool java_bytecode_languaget::parse(
213213
java_cp_include_files);
214214
if(config.java.main_class.empty())
215215
{
216-
auto manifest=
217-
java_class_loader.jar_pool(class_loader_limit, path).get_manifest();
216+
auto manifest = java_class_loader.jar_pool(path).get_manifest();
218217
std::string manifest_main_class=manifest["Main-Class"];
219218

220219
// if the manifest declares a Main-Class line, we got a main class

jbmc/src/java_bytecode/java_class_loader.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ optionalt<java_bytecode_parse_treet> java_class_loadert::get_class_from_jar(
8282
debug()
8383
<< "Getting class `" << class_name << "' from JAR " << jar_file << eom;
8484

85-
auto data =
86-
jar_pool(class_loader_limit, jar_file).get_entry(jar_index_it->second);
85+
auto data = jar_pool(jar_file).get_entry(jar_index_it->second);
8786

8887
if(!data.has_value())
8988
return {};
@@ -256,7 +255,7 @@ java_class_loadert::jar_index_optcreft java_class_loadert::read_jar_file(
256255
std::vector<std::string> filenames;
257256
try
258257
{
259-
filenames = this->jar_pool(class_loader_limit, jar_path).filenames();
258+
filenames = this->jar_pool(jar_path).filenames();
260259
}
261260
catch(const std::runtime_error &)
262261
{
@@ -331,7 +330,6 @@ std::string java_class_loadert::class_name_to_file(const irep_idt &class_name)
331330
}
332331

333332
jar_filet &java_class_loadert::jar_pool(
334-
java_class_loader_limitt &class_loader_limit,
335333
const std::string &file_name)
336334
{
337335
const auto it=m_archives.find(file_name);
@@ -346,7 +344,6 @@ jar_filet &java_class_loadert::jar_pool(
346344
}
347345

348346
jar_filet &java_class_loadert::jar_pool(
349-
java_class_loader_limitt &class_loader_limit,
350347
const std::string &buffer_name,
351348
const void *pmem,
352349
size_t size)

jbmc/src/java_bytecode/java_class_loader.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,7 @@ class java_class_loadert:public messaget
102102
/// Load jar archive or retrieve from cache if already loaded
103103
/// \param limit
104104
/// \param filename name of the file
105-
jar_filet &jar_pool(
106-
java_class_loader_limitt &limit, const std::string &filename);
105+
jar_filet &jar_pool(const std::string &filename);
107106

108107
/// Load jar archive or retrieve from cache if already loaded
109108
/// \param limit
@@ -113,7 +112,6 @@ class java_class_loadert:public messaget
113112
/// Note that this mocks the existence of a file which may
114113
/// or may not exist since the actual data bis retrieved from memory.
115114
jar_filet &jar_pool(
116-
java_class_loader_limitt &limit,
117115
const std::string &buffer_name,
118116
const void *pmem,
119117
size_t size);

0 commit comments

Comments
 (0)