aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-04-08 20:26:47 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-04-08 20:26:47 -0700
commitc5b4f5f2b8c5efb85e862bedf526c7ff49b5e406 (patch)
treece617209289baa0827e171307874387240c92119 /src
parent11f19e615c6046751c3a578e67ca027cfaf55367 (diff)
parent66883355e44a2e671c997a7df2193b585be893d7 (diff)
Merge branch 'sscanf' of github.com:artdent/emscripten into artdent-sscanf
Diffstat (limited to 'src')
-rw-r--r--src/library.js7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/library.js b/src/library.js
index b63ac955..f6b2a31e 100644
--- a/src/library.js
+++ b/src/library.js
@@ -2513,6 +2513,11 @@ LibraryManager.library = {
if (format[formatIndex] === '%') {
formatIndex++;
+ var suppressAssignment = false;
+ if (format[formatIndex] == '*') {
+ suppressAssignment = true;
+ formatIndex++;
+ }
var maxSpecifierStart = formatIndex;
while (format[formatIndex].charCodeAt(0) >= {{{ charCode('0') }}} &&
format[formatIndex].charCodeAt(0) <= {{{ charCode('9') }}}) {
@@ -2578,6 +2583,8 @@ LibraryManager.library = {
unget();
}
if (buffer.length === 0) return 0; // Failure.
+ if (suppressAssignment) continue;
+
var text = buffer.join('');
var argPtr = {{{ makeGetValue('varargs', 'argIndex', 'void*') }}};
argIndex += Runtime.getNativeFieldSize('void*');