Mercurial > hg > truffle
comparison src/share/vm/runtime/arguments.cpp @ 7643:3ac7d10a6572
Merge with hsx25/hotspot.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Thu, 31 Jan 2013 15:42:25 +0100 |
parents | 989155e2d07a c73c3f2c5b3b |
children | afa802ff433c |
comparison
equal
deleted
inserted
replaced
7573:17b6a63fe7c2 | 7643:3ac7d10a6572 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | 4 * |
5 * This code is free software; you can redistribute it and/or modify it | 5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as | 6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
543 } | 543 } |
544 | 544 |
545 // Parses a memory size specification string. | 545 // Parses a memory size specification string. |
546 static bool atomull(const char *s, julong* result) { | 546 static bool atomull(const char *s, julong* result) { |
547 julong n = 0; | 547 julong n = 0; |
548 int args_read = sscanf(s, os::julong_format_specifier(), &n); | 548 int args_read = sscanf(s, JULONG_FORMAT, &n); |
549 if (args_read != 1) { | 549 if (args_read != 1) { |
550 return false; | 550 return false; |
551 } | 551 } |
552 while (*s != '\0' && isdigit(*s)) { | 552 while (*s != '\0' && isdigit(*s)) { |
553 s++; | 553 s++; |