gstparse: prefix generated parser functions so they don't get exported

Don't export those 35-something random _gst_parse_yy* symbols. These were
never in any header files and also blacklisted from our .def files, in
case anyone wonders.

diff --git a/gst/gstparse.c b/gst/gstparse.c
index f60d758..910fc8f 100644 (file)
--- a/gst/gstparse.c
+++ b/gst/gstparse.c
@@ -335,7 +335,7 @@ gst_parse_launch_full (const gchar * pipeline_description,
   GST_CAT_INFO (GST_CAT_PIPELINE, "parsing pipeline description '%s'",
       pipeline_description);
 
-  element = _gst_parse_launch (pipeline_description, error, context, flags);
+  element = priv_gst_parse_launch (pipeline_description, error, context, flags);
 
   /* don't return partially constructed pipeline if FATAL_ERRORS was given */
   if (G_UNLIKELY (error != NULL && *error != NULL && element != NULL)) {

diff --git a/gst/parse/.gitignore b/gst/parse/.gitignore
index 8daf50b..f63ad93 100644 (file)
--- a/gst/parse/.gitignore
+++ b/gst/parse/.gitignore
@@ -4,7 +4,7 @@ grammar.tab.c
 grammar.tab.h
 lex.yy.c
 parse.c
-lex._gst_parse_yy.c
+lex.priv_gst_parse_yy.c
 *.bb
 *.bbg
 *.da

diff --git a/gst/parse/Makefile.am b/gst/parse/Makefile.am
index 30abeb3..84736f6 100644 (file)
--- a/gst/parse/Makefile.am
+++ b/gst/parse/Makefile.am
@@ -7,12 +7,12 @@ EXTRA_DIST = \
        parse.l
 
 # uncomment these lines to dist the generated sources
-#BUILT_SOURCES = grammar.tab.h grammar.tab.c lex._gst_parse_yy.c
-#libgstparse_la_SOURCES = lex._gst_parse_yy.c grammar.tab.c
+#BUILT_SOURCES = grammar.tab.h grammar.tab.c lex.priv_gst_parse_yy.c
+#libgstparse_la_SOURCES = lex.priv_gst_parse_yy.c grammar.tab.c
 
 # uncomment these lines to _NOT_ dist the generated sources
-nodist_libgstparse_la_SOURCES = lex._gst_parse_yy.c grammar.tab.c
-CLEANFILES += grammar.tab.c lex._gst_parse_yy.c
+nodist_libgstparse_la_SOURCES = lex.priv_gst_parse_yy.c grammar.tab.c
+CLEANFILES += grammar.tab.c lex.priv_gst_parse_yy.c
 
 # can't use GST_ALL_CFLAGS here because that'd pull in -Werror
 libgstparse_la_CFLAGS = -I$(top_srcdir) -I$(top_builddir) \
@@ -30,7 +30,7 @@ Android.mk: Makefile.am
        > $@
 
 grammar.tab.c grammar.tab.h: grammar.y
-       $(AM_V_GEN)$(BISON_PATH) -d -v -p_gst_parse_yy $(srcdir)/grammar.y -o grammar.tab.c && \
+       $(AM_V_GEN)$(BISON_PATH) -d -v -ppriv_gst_parse_yy $(srcdir)/grammar.y -o grammar.tab.c && \
        mv grammar.tab.c grammar.tab_tmp.c && \
        echo '#ifdef HAVE_CONFIG_H' > grammar.tab_tmp2.c && \
        echo '#include <config.h>' >> grammar.tab_tmp2.c && \
@@ -39,17 +39,17 @@ grammar.tab.c grammar.tab.h: grammar.y
        rm grammar.tab_tmp.c && \
        mv grammar.tab_tmp2.c grammar.tab.c
 
-lex._gst_parse_yy.c: parse.l grammar.tab.h
-       $(AM_V_GEN)$(FLEX_PATH) -P_gst_parse_yy $^ && \
-       mv lex._gst_parse_yy.c lex._gst_parse_yy_tmp.c && \
-       echo '#ifdef HAVE_CONFIG_H' > lex._gst_parse_yy_tmp2.c && \
-       echo '#include <config.h>' >> lex._gst_parse_yy_tmp2.c && \
-       echo '#endif' >> lex._gst_parse_yy_tmp2.c && \
-       echo 'static inline int _gst_parse_yyget_column  (void * yyscanner);' >> lex._gst_parse_yy_tmp2.c && \
-       echo 'static inline void _gst_parse_yyset_column (int  column_no , void * yyscanner);' >> lex._gst_parse_yy_tmp2.c && \
-       cat lex._gst_parse_yy_tmp.c >> lex._gst_parse_yy_tmp2.c && \
-       rm lex._gst_parse_yy_tmp.c && \
-       mv lex._gst_parse_yy_tmp2.c lex._gst_parse_yy.c
+lex.priv_gst_parse_yy.c: parse.l grammar.tab.h
+       $(AM_V_GEN)$(FLEX_PATH) -Ppriv_gst_parse_yy $^ && \
+       mv lex.priv_gst_parse_yy.c lex.priv_gst_parse_yy_tmp.c && \
+       echo '#ifdef HAVE_CONFIG_H' > lex.priv_gst_parse_yy_tmp2.c && \
+       echo '#include <config.h>' >> lex.priv_gst_parse_yy_tmp2.c && \
+       echo '#endif' >> lex.priv_gst_parse_yy_tmp2.c && \
+       echo 'static inline int priv_gst_parse_yyget_column  (void * yyscanner);' >> lex.priv_gst_parse_yy_tmp2.c && \
+       echo 'static inline void priv_gst_parse_yyset_column (int  column_no , void * yyscanner);' >> lex.priv_gst_parse_yy_tmp2.c && \
+       cat lex.priv_gst_parse_yy_tmp.c >> lex.priv_gst_parse_yy_tmp2.c && \
+       rm lex.priv_gst_parse_yy_tmp.c && \
+       mv lex.priv_gst_parse_yy_tmp2.c lex.priv_gst_parse_yy.c
 
 .NOTPARALLEL:
 

diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y
index 51755cf..24fc87b 100644 (file)
--- a/gst/parse/grammar.y
+++ b/gst/parse/grammar.y
@@ -36,10 +36,10 @@
 
 typedef void* yyscan_t;
 
-int _gst_parse_yylex (void * yylval_param , yyscan_t yyscanner);
-int _gst_parse_yylex_init (yyscan_t scanner);
-int _gst_parse_yylex_destroy (yyscan_t scanner);
-struct yy_buffer_state * _gst_parse_yy_scan_string (char* , yyscan_t);
+int priv_gst_parse_yylex (void * yylval_param , yyscan_t yyscanner);
+int priv_gst_parse_yylex_init (yyscan_t scanner);
+int priv_gst_parse_yylex_destroy (yyscan_t scanner);
+struct yy_buffer_state * priv_gst_parse_yy_scan_string (char* , yyscan_t);
 void _gst_parse_yypush_buffer_state (void * new_buffer ,yyscan_t yyscanner );
 void _gst_parse_yypop_buffer_state (yyscan_t yyscanner );
 
@@ -892,7 +892,7 @@ yyerror (void *scanner, graph_t *graph, const char *s)
 
 
 GstElement *
-_gst_parse_launch (const gchar *str, GError **error, GstParseContext *ctx,
+priv_gst_parse_launch (const gchar *str, GError **error, GstParseContext *ctx,
     GstParseFlags flags)
 {
   graph_t g;
@@ -917,8 +917,8 @@ _gst_parse_launch (const gchar *str, GError **error, GstParseContext *ctx,
 #endif /* __GST_PARSE_TRACE */
 
   dstr = g_strdup (str);
-  _gst_parse_yylex_init (&scanner);
-  _gst_parse_yy_scan_string (dstr, scanner);
+  priv_gst_parse_yylex_init (&scanner);
+  priv_gst_parse_yy_scan_string (dstr, scanner);
 
 #ifndef YYDEBUG
   yydebug = 1;
@@ -928,12 +928,12 @@ _gst_parse_launch (const gchar *str, GError **error, GstParseContext *ctx,
     SET_ERROR (error, GST_PARSE_ERROR_SYNTAX,
         "Unrecoverable syntax error while parsing pipeline %s", str);
 
-    _gst_parse_yylex_destroy (scanner);
+    priv_gst_parse_yylex_destroy (scanner);
     g_free (dstr);
 
     goto error1;
   }
-  _gst_parse_yylex_destroy (scanner);
+  priv_gst_parse_yylex_destroy (scanner);
   g_free (dstr);
 
   GST_CAT_DEBUG (GST_CAT_PIPELINE, "got %u elements and %u links",

diff --git a/gst/parse/types.h b/gst/parse/types.h
index db1f585..3b2e4fd 100644 (file)
--- a/gst/parse/types.h
+++ b/gst/parse/types.h
@@ -95,7 +95,7 @@ gst_parse_unescape (gchar *str)
   *str = '\0';
 }
 
-GstElement *_gst_parse_launch (const gchar *, GError **,
+GstElement *priv_gst_parse_launch (const gchar *, GError **,
     GstParseContext *, GstParseFlags);
 
 #endif /* __GST_PARSE_TYPES_H__ */