aboutsummaryrefslogtreecommitdiffstats
path: root/json-parser.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2010-06-14 09:39:01 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2010-06-14 09:39:01 -0500
commita2da0395c12bd2b26e2180d735c83988ff66a559 (patch)
treeef70ee8d42a24a8c7d7760eac724529d904fb5ea /json-parser.c
parent09564574b868f591fb1a9cf426f0c1d64f280431 (diff)
parent02e95918b82efde24db1d759300ec3c61bd694b3 (diff)
Merge remote branch 'qmp/for-anthony' into staging
Diffstat (limited to 'json-parser.c')
-rw-r--r--json-parser.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/json-parser.c b/json-parser.c
index 1c88ed898..70b9b6f96 100644
--- a/json-parser.c
+++ b/json-parser.c
@@ -205,6 +205,10 @@ static QString *qstring_from_escaped_str(JSONParserContext *ctxt, QObject *token
qstring_append(str, "\b");
ptr++;
break;
+ case 'f':
+ qstring_append(str, "\f");
+ ptr++;
+ break;
case 'n':
qstring_append(str, "\n");
ptr++;