Skip to content

Commit 8f1f3cf

Browse files
committed
Backport 3aa59b3139d6ca88afb4339510b0a47ec15c8959
1 parent 81d7b70 commit 8f1f3cf

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

src/jdk.hotspot.agent/linux/native/libsaproc/LinuxDebuggerLocal.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,6 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLo
421421
jboolean isCopy;
422422
jlongArray array;
423423
jlong *regs;
424-
int i;
425424

426425
struct ps_prochandle* ph = get_proc_handle(env, this_obj);
427426
if (get_lwp_regs(ph, lwp_id, &gregs) != true) {

src/jdk.hotspot.agent/linux/native/libsaproc/symtab.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,6 @@ static struct symtab* build_symtab_internal(int fd, const char *filename, bool t
359359

360360
if (shdr->sh_type == sym_section) {
361361
ELF_SYM *syms;
362-
int rslt;
363362
size_t size, n, j, htab_sz;
364363

365364
// FIXME: there could be multiple data buffers associated with the
@@ -393,7 +392,8 @@ static struct symtab* build_symtab_internal(int fd, const char *filename, bool t
393392
goto bad;
394393
}
395394

396-
rslt = hcreate_r(n, symtab->hash_table);
395+
// int rslt =
396+
hcreate_r(n, symtab->hash_table);
397397
// guarantee(rslt, "unexpected failure: hcreate_r");
398398

399399
// shdr->sh_link points to the section that contains the actual strings

src/jdk.jpackage/share/native/common/Log.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ namespace {
4040
// variables are initialized if any. This will result in AV. To avoid such
4141
// use cases keep logging module free from static variables that require
4242
// initialization with functions called by CRT.
43-
//
44-
45-
// by default log everything
46-
const Logger::LogLevel defaultLogLevel = Logger::LOG_TRACE;
4743

4844
char defaultLogAppenderMemory[sizeof(StreamLogAppender)] = {};
4945

0 commit comments

Comments
 (0)