aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Larsson <banan@ludd.ltu.se>2009-09-10 19:08:03 +0000
committerBenjamin Larsson <banan@ludd.ltu.se>2009-09-10 19:08:03 +0000
commitc64c0a9b76d583be8d6f9d5c40a84fed8d62f707 (patch)
tree8fca14c980dbd2a1703acf30d9e8f0de72566174
parent7141c8594d196ae99a86efcbd7647725bc053ac6 (diff)
downloadffmpeg-c64c0a9b76d583be8d6f9d5c40a84fed8d62f707.tar.gz
Move get_arg to avoid future declaration of function when
new code is added. Originally committed as revision 19815 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffserver.c64
1 files changed, 32 insertions, 32 deletions
diff --git a/ffserver.c b/ffserver.c
index d49d3d0b89..5cbdc39e81 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -1192,6 +1192,38 @@ static void get_word(char *buf, int buf_size, const char **pp)
*pp = p;
}
+static void get_arg(char *buf, int buf_size, const char **pp)
+{
+ const char *p;
+ char *q;
+ int quote;
+
+ p = *pp;
+ while (isspace(*p)) p++;
+ q = buf;
+ quote = 0;
+ if (*p == '\"' || *p == '\'')
+ quote = *p++;
+ for(;;) {
+ if (quote) {
+ if (*p == quote)
+ break;
+ } else {
+ if (isspace(*p))
+ break;
+ }
+ if (*p == '\0')
+ break;
+ if ((q - buf) < buf_size - 1)
+ *q++ = *p;
+ p++;
+ }
+ *q = '\0';
+ if (quote && *p == quote)
+ p++;
+ *pp = p;
+}
+
static int validate_acl(FFStream *stream, HTTPContext *c)
{
enum IPAddressAction last_action = IP_DENY;
@@ -3620,38 +3652,6 @@ static void compute_bandwidth(void)
}
}
-static void get_arg(char *buf, int buf_size, const char **pp)
-{
- const char *p;
- char *q;
- int quote;
-
- p = *pp;
- while (isspace(*p)) p++;
- q = buf;
- quote = 0;
- if (*p == '\"' || *p == '\'')
- quote = *p++;
- for(;;) {
- if (quote) {
- if (*p == quote)
- break;
- } else {
- if (isspace(*p))
- break;
- }
- if (*p == '\0')
- break;
- if ((q - buf) < buf_size - 1)
- *q++ = *p;
- p++;
- }
- *q = '\0';
- if (quote && *p == quote)
- p++;
- *pp = p;
-}
-
/* add a codec and set the default parameters */
static void add_codec(FFStream *stream, AVCodecContext *av)
{