RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ffprobe: factorize xml_print_str and xml_print_int 

Introduce xml_print_value to avoid logic duplication.
This commit is contained in:
Stefano Sabatini 2023-10-19 00:23:10 +02:00
parent 9dc834e71f
commit bf84ec0049
1 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
fftools/ffprobe.c
View File

@ -1858,7 +1858,7 @@ static void xml_print_section_footer(WriterContext *wctx)
} }
} }
static void xml_print_str(WriterContext *wctx, const char *key, const char *value) static void xml_print_value(WriterContext *wctx, const char *key, const void *value, const int is_int)
{ {
AVBPrint buf; AVBPrint buf;
XMLContext *xml = wctx->priv; XMLContext *xml = wctx->priv;
@ -1875,44 +1875,36 @@ static void xml_print_str(WriterContext *wctx, const char *key, const char *valu
section->element_name, buf.str); section->element_name, buf.str);
av_bprint_clear(&buf); av_bprint_clear(&buf);
av_bprint_escape(&buf, value, NULL, if (is_int) {
writer_printf(wctx, " value=\"%lld\"/>\n", *(long long int *)value);
} else {
av_bprint_escape(&buf, (const char *)value, NULL,
AV_ESCAPE_MODE_XML, AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES); AV_ESCAPE_MODE_XML, AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES);
writer_printf(wctx, " value=\"%s\"/>\n", buf.str); writer_printf(wctx, " value=\"%s\"/>\n", buf.str);
}
xml->indent_level--; xml->indent_level--;
} else { } else {
if (wctx->nb_item[wctx->level]) if (wctx->nb_item[wctx->level])
writer_w8(wctx, ' '); writer_w8(wctx, ' ');
av_bprint_escape(&buf, value, NULL, if (is_int) {
writer_printf(wctx, "%s=\"%lld\"", key, *(long long int *)value);
} else {
av_bprint_escape(&buf, (const char *)value, NULL,
AV_ESCAPE_MODE_XML, AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES); AV_ESCAPE_MODE_XML, AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES);
writer_printf(wctx, "%s=\"%s\"", key, buf.str); writer_printf(wctx, "%s=\"%s\"", key, buf.str);
} }
}
av_bprint_finalize(&buf, NULL); av_bprint_finalize(&buf, NULL);
} }
static void xml_print_int(WriterContext *wctx, const char *key, long long int value) static inline void xml_print_str(WriterContext *wctx, const char *key, const char *value) {
{ xml_print_value(wctx, key, (const void *)value, 0);
XMLContext *xml = wctx->priv; }
const struct section *section = wctx->section[wctx->level];
if (section->flags & SECTION_FLAG_HAS_VARIABLE_FIELDS) { static inline void xml_print_int(WriterContext *wctx, const char *key, long long int value) {
AVBPrint buf; xml_print_value(wctx, key, (const void *)&value, 1);
av_bprint_init(&buf, 1, AV_BPRINT_SIZE_UNLIMITED);
xml->indent_level++;
XML_INDENT();
av_bprint_escape(&buf, key, NULL,
AV_ESCAPE_MODE_XML, AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES);
writer_printf(wctx, "<%s key=\"%s\"",
section->element_name, buf.str);
writer_printf(wctx, " value=\"%lld\"/>\n", value);
xml->indent_level--;
} else {
if (wctx->nb_item[wctx->level])
writer_w8(wctx, ' ');
writer_printf(wctx, "%s=\"%lld\"", key, value);
}
} }
static Writer xml_writer = { static Writer xml_writer = {