virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

ffprobe: Simplify CSV field quoting code

Browse Source 
Sync with bac1b31 .

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
This commit is contained in:
Alexander Strasser 2012-09-17 01:26:11 +02:00
parent 7e3208a087
commit f70122dd57
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ffprobe.c
View File

@ -26,6 +26,8 @@
#include "config.h" #include "config.h"
#include "version.h" #include "version.h"
#include <string.h>
#include "libavformat/avformat.h" #include "libavformat/avformat.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavutil/avstring.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) static const char *csv_escape_str(AVBPrint *dst, const char *src, const char sep, void *log_ctx)
{ {
const char *p; int quote = !!src[strcspn(src, "\",\n\r")];
int quote = 0;
/* check if input needs quoting */
for (p = src; *p; p++)
if (*p == '"' || *p == sep || *p == '\n' || *p == '\r')
quote = 1;
if (quote) if (quote)
av_bprint_chars(dst, '\"', 1); av_bprint_chars(dst, '\"', 1);
for (p = src; *p; p++) { for (; *src; src++) {
if (*p == '"') if (*src == '"')
av_bprint_chars(dst, '\"', 1); av_bprint_chars(dst, '\"', 1);
av_bprint_chars(dst, *p, 1); av_bprint_chars(dst, *src, 1);
} }
if (quote) if (quote)
av_bprint_chars(dst, '\"', 1); av_bprint_chars(dst, '\"', 1);