mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-29 19:50:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate: Consider ',' as continuing line marker in struct files

Browse source 
Since `,` is the separator between fields of GstStructure we can
safely consider that if a line ends with it, the following line
is the logical continuity of the serialized GstStructure.

This makes writing those files more convenient and reading them
more pleasant as we do not need to add extra `\` at end of lines
anymore
This commit is contained in:
Thibault Saunier 2020-02-19 22:16:44 -03:00
parent 2f135d430b
commit a12cb70422
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
validate/gst/validate/gst-validate-utils.c
View file

@ -46,6 +46,7 @@
#define PARSER_MAX_ARGUMENT_COUNT 10
static GRegex *_clean_structs_lines = NULL;
static GRegex *_line_breaking_char = NULL;
static GRegex *_variables_regex = NULL;
static GstStructure *global_vars = NULL;
@ -550,7 +551,7 @@ _file_get_lines (GFile * file)
gsize size;
GError *err = NULL;
gchar *content = NULL, *escaped_content = NULL, **lines = NULL;
gchar *content = NULL, *escaped_content = NULL, **lines = NULL, *tmp;
/* TODO Handle GCancellable */
if (!g_file_load_contents (file, NULL, &content, &size, NULL, &err)) {
@ -563,16 +564,24 @@ _file_get_lines (GFile * file)
return NULL;
}
if (_clean_structs_lines == NULL)
if (_clean_structs_lines == NULL) {
_clean_structs_lines =
g_regex_new ("\\\\\n|#.*\n", G_REGEX_CASELESS, 0, NULL);
_line_breaking_char = g_regex_new (",\\n", G_REGEX_CASELESS, 0, NULL);
}
escaped_content =
g_regex_replace (_clean_structs_lines, content, -1, 0, "", 0, NULL);
g_free (content);
tmp =
g_regex_replace (_line_breaking_char, escaped_content, -1, 0, ",", 0,
NULL);
g_free (escaped_content);
escaped_content = tmp;
lines = g_strsplit (escaped_content, "\n", 0);
g_free (escaped_content);
g_free (content);
return lines;
}