From ac896f0cd1b1e71f1f62da451dc96abef80f3c71 Mon Sep 17 00:00:00 2001
From: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Date: Sat, 6 Dec 2014 02:14:20 -0300
Subject: [PATCH] ffserver_config: reflow _get_arg()
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
---
ffserver_config.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/ffserver_config.c b/ffserver_config.c
index 1e79a5d9202..9f9655ef5e7 100644
--- a/ffserver_config.c
+++ b/ffserver_config.c
@@ -84,28 +84,24 @@ void ffserver_get_arg(char *buf, int buf_size, const char **pp)
{
const char *p;
char *q;
- int quote;
+ int quote = 0;
p = *pp;
- while (av_isspace(*p)) p++;
q = buf;
- quote = 0;
+
+ while (av_isspace(*p)) p++;
+
if (*p == '\"' || *p == '\'')
quote = *p++;
- for(;;) {
- if (quote) {
- if (*p == quote)
- break;
- } else {
- if (av_isspace(*p))
- break;
- }
- if (*p == '\0')
+
+ while (*p != '\0') {
+ if (quote && *p == quote || !quote && av_isspace(*p))
break;
if ((q - buf) < buf_size - 1)
*q++ = *p;
p++;
}
+
*q = '\0';
if (quote && *p == quote)
p++;
--
GitLab