archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8037816: Fix for 8036122 breaks build with Xcode5/clang

Browse source 
Repaired or selectively disabled offending formats; future-proofed with additional checking

Reviewed-by: kvn, jrose, stefank
This commit is contained in:
David Chase 2014-05-09 16:50:54 -04:00
parent 563feb9091
commit 305ec3bd3f
293 changed files with 1285 additions and 913 deletions
Download patch file Download diff file Expand all files Collapse all files

16
hotspot/src/share/vm/utilities/ostream.cpp
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -268,7 +268,7 @@ void outputStream::print_data(void* data, size_t len, bool with_ascii) {
size_t limit = (len + 16) / 16 * 16;
for (size_t i = 0; i < limit; ++i) {
if (i % 16 == 0) {
indent().print("%07x:", i);
indent().print(INTPTR_FORMAT_W(07)":", i);
}
if (i % 2 == 0) {
print(" ");
@ -289,7 +289,7 @@ void outputStream::print_data(void* data, size_t len, bool with_ascii) {
}
}
}
print_cr("");
cr();
}
}
}
@ -606,7 +606,7 @@ void fdStream::write(const char* s, size_t len) {
// memory usage and command line flags into header
void gcLogFileStream::dump_loggc_header() {
if (is_open()) {
print_cr(Abstract_VM_Version::internal_vm_info_string());
print_cr("%s", Abstract_VM_Version::internal_vm_info_string());
os::print_memory_info(this);
print("CommandLine flags: ");
CommandLineFlags::printSetFlags(this);
@ -687,7 +687,7 @@ void gcLogFileStream::rotate_log(bool force, outputStream* out) {
write(time_msg, strlen(time_msg));
if (out != NULL) {
out->print(time_msg);
out->print("%s", time_msg);
}
dump_loggc_header();
@ -720,7 +720,7 @@ void gcLogFileStream::rotate_log(bool force, outputStream* out) {
write(time_msg, strlen(time_msg));
if (out != NULL) {
out->print(time_msg);
out->print("%s", time_msg);
}
fclose(_file);
@ -765,7 +765,7 @@ void gcLogFileStream::rotate_log(bool force, outputStream* out) {
write(time_msg, strlen(time_msg));
if (out != NULL) {
out->print(time_msg);
out->print("%s", time_msg);
}
dump_loggc_header();
@ -845,7 +845,7 @@ void defaultStream::init_log() {
xs->head("hotspot_log version='%d %d'"
" process='%d' time_ms='"INT64_FORMAT"'",
LOG_MAJOR_VERSION, LOG_MINOR_VERSION,
os::current_process_id(), time_ms);
os::current_process_id(), (int64_t)time_ms);
// Write VM version header immediately.
xs->head("vm_version");
xs->head("name"); xs->text("%s", VM_Version::vm_name()); xs->cr();