jdk-sandbox: comparison hotspot/src/share/vm/utilities/ostream.cpp

equal deleted inserted replaced

-:8528b67f6562
+:2658d7834c6e
 /*
-* 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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 */
 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(" ");
 }
 if (i < len) {
 char c = ((char*)data)[idx];
 print("%c", c >= 32 && c <= 126 ? c : '.');
 }
 }
 }
-print_cr("");
+cr();
 }
 }
 }
 stringStream::stringStream(size_t initial_size) : outputStream() {
 // dump vm version, os version, platform info, build id,
 // 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);
 }
 }
 jio_snprintf(time_msg, sizeof(time_msg), "File  %s rotated at %s\n",
 _file_name, os::local_time_string((char *)time_str, sizeof(time_str)));
 write(time_msg, strlen(time_msg));
 if (out != NULL) {
-out->print(time_msg);
+out->print("%s", time_msg);
 }
 dump_loggc_header();
 return;
 }
 os::local_time_string((char *)time_str, sizeof(time_str)),
 msg, renamed_file_name);
 write(time_msg, strlen(time_msg));
 if (out != NULL) {
-out->print(time_msg);
+out->print("%s", time_msg);
 }
 fclose(_file);
 _file = NULL;
 os::local_time_string((char *)time_str, sizeof(time_str)),
 current_file_name);
 write(time_msg, strlen(time_msg));
 if (out != NULL) {
-out->print(time_msg);
+out->print("%s", time_msg);
 }
 dump_loggc_header();
 // remove the existing file
 if (access(current_file_name, F_OK) == 0) {
 // %%% Should be: jlong time_ms = os::start_time_milliseconds(), if
 // we ever get round to introduce that method on the os class
 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();
 xs->tail("name");
 xs->head("release"); xs->text("%s", VM_Version::vm_release()); xs->cr();

changeset 24424	2658d7834c6e
parent 23517	27c4307d6cda
child 25350	6423a57e5451