conf: Convert ParseString to use STRPREFIX

This commit is contained in:
Cole Robinson 2010-11-18 17:33:36 -05:00
parent 4610a2d51a
commit f57c0b23a8

View File

@ -394,17 +394,20 @@ virConfParseString(virConfParserCtxtPtr ctxt)
return NULL; return NULL;
} }
NEXT; NEXT;
} else if ((ctxt->cur + 6 < ctxt->end) && (ctxt->cur[0] == '"') && } else if ((ctxt->cur + 6 < ctxt->end) &&
(ctxt->cur[1] == '"') && (ctxt->cur[2] == '"')) { (STRPREFIX(ctxt->cur, "\"\"\""))) {
/* String starts with python-style triple quotes """ */
ctxt->cur += 3; ctxt->cur += 3;
base = ctxt->cur; base = ctxt->cur;
while ((ctxt->cur + 2 < ctxt->end) && (ctxt->cur[0] == '"') &&
(ctxt->cur[1] == '"') && (ctxt->cur[2] == '"')) { while ((ctxt->cur + 2 < ctxt->end) &&
if (CUR == '\n') ctxt->line++; (STRPREFIX(ctxt->cur, "\"\"\""))) {
NEXT; if (CUR == '\n')
ctxt->line++;
NEXT;
} }
if ((ctxt->cur[0] != '"') || (ctxt->cur[1] != '"') ||
(ctxt->cur[2] != '"')) { if (!STRPREFIX(ctxt->cur, "\"\"\"")) {
virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("unterminated string")); virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("unterminated string"));
return(NULL); return(NULL);
} }