From f70122dd574e95bb77993abbecaae9ba1020336f Mon Sep 17 00:00:00 2001 From: Alexander Strasser Date: Mon, 17 Sep 2012 01:26:11 +0200 Subject: [PATCH] ffprobe: Simplify CSV field quoting code Sync with bac1b31 . Signed-off-by: Alexander Strasser --- ffprobe.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/ffprobe.c b/ffprobe.c index 48d395bda4..8a369ba1b8 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -26,6 +26,8 @@ #include "config.h" #include "version.h" +#include + #include "libavformat/avformat.h" #include "libavcodec/avcodec.h" #include "libavutil/avstring.h" @@ -565,21 +567,15 @@ static const char *c_escape_str(AVBPrint *dst, const char *src, const char sep, */ static const char *csv_escape_str(AVBPrint *dst, const char *src, const char sep, void *log_ctx) { - const char *p; - int quote = 0; - - /* check if input needs quoting */ - for (p = src; *p; p++) - if (*p == '"' || *p == sep || *p == '\n' || *p == '\r') - quote = 1; + int quote = !!src[strcspn(src, "\",\n\r")]; if (quote) av_bprint_chars(dst, '\"', 1); - for (p = src; *p; p++) { - if (*p == '"') + for (; *src; src++) { + if (*src == '"') av_bprint_chars(dst, '\"', 1); - av_bprint_chars(dst, *p, 1); + av_bprint_chars(dst, *src, 1); } if (quote) av_bprint_chars(dst, '\"', 1);