Make parse_link_name() return a pointer to the name read

Commited in SoC by Vitor Sessak on 2008-05-24 12:57:20

Originally committed as revision 13343 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c
index 09be0dabae6181fa54210fd86d5a6f2a08ff521a..9ce24f450ff6d89d3931c1c3d7ee2439363a1f26 100644 (file)
--- a/libavfilter/graphparser.c
+++ b/libavfilter/graphparser.c
@@ -94,14 +94,15 @@ static char *consume_string(const char **buf)
  * @arg name a pointer (that need to be free'd after use) to the name between
  *           parenthesis
  */
-static void parse_link_name(const char **buf, char **name, AVClass *log_ctx)
+static char *parse_link_name(const char **buf, AVClass *log_ctx)
 {
     const char *start = *buf;
+    char *name;
     (*buf)++;
 
-    *name = consume_string(buf);
+    name = consume_string(buf);
 
-    if(!*name[0]) {
+    if(!name[0]) {
         av_log(log_ctx, AV_LOG_ERROR,
                "Bad (empty?) label found in the following: \"%s\".\n", start);
         goto fail;
@@ -111,8 +112,10 @@ static void parse_link_name(const char **buf, char **name, AVClass *log_ctx)
         av_log(log_ctx, AV_LOG_ERROR,
                "Mismatched '[' found in the following: \"%s\".\n", start);
     fail:
-        av_freep(name);
+        av_freep(&name);
     }
+
+    return name;
 }
 
 static AVFilterContext *create_filter(AVFilterGraph *ctx, int index,
@@ -255,12 +258,10 @@ static int parse_inputs(const char **buf, AVFilterInOut **currInputs,
     int pad = 0;
 
     while(**buf == '[') {
-        char *name;
+        char *name = parse_link_name(buf, log_ctx);
         AVFilterInOut *link_to_add;
         AVFilterInOut *match;
 
-        parse_link_name(buf, &name, log_ctx);
-
         if(!name)
             return -1;
 
@@ -301,14 +302,12 @@ static int parse_outputs(const char **buf, AVFilterInOut **currInputs,
     int pad = 0;
 
     while(**buf == '[') {
-        char *name;
+        char *name = parse_link_name(buf, log_ctx);
         AVFilterInOut *match;
 
         AVFilterInOut *input = *currInputs;
         *currInputs = (*currInputs)->next;
 
-        parse_link_name(buf, &name, log_ctx);
-
         if(!name)
             return -1;