File tree Expand file tree Collapse file tree 3 files changed +4
-10
lines changed Expand file tree Collapse file tree 3 files changed +4
-10
lines changed Original file line number Diff line number Diff line change @@ -213,8 +213,7 @@ bool java_bytecode_languaget::parse(
213
213
java_cp_include_files);
214
214
if (config.java .main_class .empty ())
215
215
{
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 ();
218
217
std::string manifest_main_class=manifest[" Main-Class" ];
219
218
220
219
// if the manifest declares a Main-Class line, we got a main class
Original file line number Diff line number Diff line change @@ -82,8 +82,7 @@ optionalt<java_bytecode_parse_treet> java_class_loadert::get_class_from_jar(
82
82
debug ()
83
83
<< " Getting class `" << class_name << " ' from JAR " << jar_file << eom;
84
84
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 );
87
86
88
87
if (!data.has_value ())
89
88
return {};
@@ -256,7 +255,7 @@ java_class_loadert::jar_index_optcreft java_class_loadert::read_jar_file(
256
255
std::vector<std::string> filenames;
257
256
try
258
257
{
259
- filenames = this ->jar_pool (class_loader_limit, jar_path).filenames ();
258
+ filenames = this ->jar_pool (jar_path).filenames ();
260
259
}
261
260
catch (const std::runtime_error &)
262
261
{
@@ -331,7 +330,6 @@ std::string java_class_loadert::class_name_to_file(const irep_idt &class_name)
331
330
}
332
331
333
332
jar_filet &java_class_loadert::jar_pool (
334
- java_class_loader_limitt &class_loader_limit,
335
333
const std::string &file_name)
336
334
{
337
335
const auto it=m_archives.find (file_name);
@@ -346,7 +344,6 @@ jar_filet &java_class_loadert::jar_pool(
346
344
}
347
345
348
346
jar_filet &java_class_loadert::jar_pool (
349
- java_class_loader_limitt &class_loader_limit,
350
347
const std::string &buffer_name,
351
348
const void *pmem,
352
349
size_t size)
Original file line number Diff line number Diff line change @@ -102,8 +102,7 @@ class java_class_loadert:public messaget
102
102
// / Load jar archive or retrieve from cache if already loaded
103
103
// / \param limit
104
104
// / \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);
107
106
108
107
// / Load jar archive or retrieve from cache if already loaded
109
108
// / \param limit
@@ -113,7 +112,6 @@ class java_class_loadert:public messaget
113
112
// / Note that this mocks the existence of a file which may
114
113
// / or may not exist since the actual data bis retrieved from memory.
115
114
jar_filet &jar_pool (
116
- java_class_loader_limitt &limit,
117
115
const std::string &buffer_name,
118
116
const void *pmem,
119
117
size_t size);
You can’t perform that action at this time.
0 commit comments