1.1 --- a/src/share/vm/utilities/ostream.cpp Thu May 15 18:23:26 2014 -0400
1.2 +++ b/src/share/vm/utilities/ostream.cpp Thu May 22 15:52:41 2014 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -268,7 +268,7 @@
1.11 size_t limit = (len + 16) / 16 * 16;
1.12 for (size_t i = 0; i < limit; ++i) {
1.13 if (i % 16 == 0) {
1.14 - indent().print("%07x:", i);
1.15 + indent().print(SIZE_FORMAT_HEX_W(07)":", i);
1.16 }
1.17 if (i % 2 == 0) {
1.18 print(" ");
1.19 @@ -289,7 +289,7 @@
1.20 }
1.21 }
1.22 }
1.23 - print_cr("");
1.24 + cr();
1.25 }
1.26 }
1.27 }
1.28 @@ -606,7 +606,7 @@
1.29 // memory usage and command line flags into header
1.30 void gcLogFileStream::dump_loggc_header() {
1.31 if (is_open()) {
1.32 - print_cr(Abstract_VM_Version::internal_vm_info_string());
1.33 + print_cr("%s", Abstract_VM_Version::internal_vm_info_string());
1.34 os::print_memory_info(this);
1.35 print("CommandLine flags: ");
1.36 CommandLineFlags::printSetFlags(this);
1.37 @@ -687,7 +687,7 @@
1.38 write(time_msg, strlen(time_msg));
1.39
1.40 if (out != NULL) {
1.41 - out->print(time_msg);
1.42 + out->print("%s", time_msg);
1.43 }
1.44
1.45 dump_loggc_header();
1.46 @@ -720,7 +720,7 @@
1.47 write(time_msg, strlen(time_msg));
1.48
1.49 if (out != NULL) {
1.50 - out->print(time_msg);
1.51 + out->print("%s", time_msg);
1.52 }
1.53
1.54 fclose(_file);
1.55 @@ -765,7 +765,7 @@
1.56 write(time_msg, strlen(time_msg));
1.57
1.58 if (out != NULL) {
1.59 - out->print(time_msg);
1.60 + out->print("%s", time_msg);
1.61 }
1.62
1.63 dump_loggc_header();
1.64 @@ -845,7 +845,7 @@
1.65 xs->head("hotspot_log version='%d %d'"
1.66 " process='%d' time_ms='"INT64_FORMAT"'",
1.67 LOG_MAJOR_VERSION, LOG_MINOR_VERSION,
1.68 - os::current_process_id(), time_ms);
1.69 + os::current_process_id(), (int64_t)time_ms);
1.70 // Write VM version header immediately.
1.71 xs->head("vm_version");
1.72 xs->head("name"); xs->text("%s", VM_Version::vm_name()); xs->cr();
