Mercurial > hg > truffle
comparison src/share/vm/runtime/arguments.cpp @ 7627:c73c3f2c5b3b
Merge
author | acorn |
---|---|
date | Mon, 21 Jan 2013 16:11:24 -0500 |
parents | f1c06dcee0b5 203f64878aab |
children | 3ac7d10a6572 8b46b0196eb0 8391fdd36e1f f64ffbf81af5 b5cb079ecaa4 |
comparison
equal
deleted
inserted
replaced
7622:617b18aadb33 | 7627:c73c3f2c5b3b |
---|---|
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. |
530 } | 530 } |
531 | 531 |
532 // Parses a memory size specification string. | 532 // Parses a memory size specification string. |
533 static bool atomull(const char *s, julong* result) { | 533 static bool atomull(const char *s, julong* result) { |
534 julong n = 0; | 534 julong n = 0; |
535 int args_read = sscanf(s, os::julong_format_specifier(), &n); | 535 int args_read = sscanf(s, JULONG_FORMAT, &n); |
536 if (args_read != 1) { | 536 if (args_read != 1) { |
537 return false; | 537 return false; |
538 } | 538 } |
539 while (*s != '\0' && isdigit(*s)) { | 539 while (*s != '\0' && isdigit(*s)) { |
540 s++; | 540 s++; |