[FFmpeg-cvslog] ffserver_config: reflow _get_arg()

Reynaldo H. Verdejo Pinochet git at videolan.org
Sat Dec 6 06:25:44 CET 2014


ffmpeg | branch: master | Reynaldo H. Verdejo Pinochet <reynaldo at osg.samsung.com> | Sat Dec  6 02:14:20 2014 -0300| [ac896f0cd1b1e71f1f62da451dc96abef80f3c71] | committer: Reynaldo H. Verdejo Pinochet

ffserver_config: reflow _get_arg()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo at osg.samsung.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ac896f0cd1b1e71f1f62da451dc96abef80f3c71
---

 ffserver_config.c |   20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/ffserver_config.c b/ffserver_config.c
index 1e79a5d..9f9655e 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++;



More information about the ffmpeg-cvslog mailing list