Run gst-indent through the files

This is required before we enabled an indent test in the CI.

https://gitlab.freedesktop.org/gstreamer/gstreamer-project/issues/33
This commit is contained in:
Jordan Petridis 2018-11-28 12:09:28 +02:00
parent 9e8d215f90
commit 61074f6d8d
No known key found for this signature in database
GPG key ID: 902CC06D159744F5
2 changed files with 36 additions and 39 deletions

View file

@ -28,13 +28,13 @@
#include <gst/pbutils/pbutils.h> #include <gst/pbutils/pbutils.h>
#ifndef LOCAL_FUZZ_BUILD #ifndef LOCAL_FUZZ_BUILD
GST_PLUGIN_STATIC_DECLARE(coreelements); GST_PLUGIN_STATIC_DECLARE (coreelements);
GST_PLUGIN_STATIC_DECLARE(playback); GST_PLUGIN_STATIC_DECLARE (playback);
GST_PLUGIN_STATIC_DECLARE(typefindfunctions); GST_PLUGIN_STATIC_DECLARE (typefindfunctions);
GST_PLUGIN_STATIC_DECLARE(app); GST_PLUGIN_STATIC_DECLARE (app);
GST_PLUGIN_STATIC_DECLARE(ogg); GST_PLUGIN_STATIC_DECLARE (ogg);
GST_PLUGIN_STATIC_DECLARE(theora); GST_PLUGIN_STATIC_DECLARE (theora);
GST_PLUGIN_STATIC_DECLARE(vorbis); GST_PLUGIN_STATIC_DECLARE (vorbis);
#endif #endif
/* push-based discoverer fuzzing target /* push-based discoverer fuzzing target
@ -57,34 +57,34 @@ const guint8 *fuzztesting_data;
size_t fuzztesting_size; size_t fuzztesting_size;
static void static void
appsrc_configuration (GstDiscoverer *dc, GstElement *source, gpointer data) appsrc_configuration (GstDiscoverer * dc, GstElement * source, gpointer data)
{ {
GstBuffer *buf; GstBuffer *buf;
GstFlowReturn ret; GstFlowReturn ret;
/* Create buffer from fuzztesting_data which shouldn't be freed */ /* Create buffer from fuzztesting_data which shouldn't be freed */
buf = gst_buffer_new_wrapped_full (0, (gpointer) fuzztesting_data, fuzztesting_size, buf =
0, fuzztesting_size, NULL, NULL); gst_buffer_new_wrapped_full (0, (gpointer) fuzztesting_data,
fuzztesting_size, 0, fuzztesting_size, NULL, NULL);
g_object_set (G_OBJECT (source), "size", fuzztesting_size, NULL); g_object_set (G_OBJECT (source), "size", fuzztesting_size, NULL);
g_signal_emit_by_name (G_OBJECT(source), "push-buffer", buf, &ret); g_signal_emit_by_name (G_OBJECT (source), "push-buffer", buf, &ret);
gst_buffer_unref (buf); gst_buffer_unref (buf);
} }
static void static void
custom_logger (const gchar *log_domain, custom_logger (const gchar * log_domain,
GLogLevelFlags log_level, GLogLevelFlags log_level, const gchar * message, gpointer unused_data)
const gchar *message,
gpointer unused_data)
{ {
if (log_level & G_LOG_LEVEL_CRITICAL) { if (log_level & G_LOG_LEVEL_CRITICAL) {
g_printerr ("CRITICAL ERROR : %s\n", message); g_printerr ("CRITICAL ERROR : %s\n", message);
abort(); abort ();
} else if (log_level & G_LOG_LEVEL_WARNING) { } else if (log_level & G_LOG_LEVEL_WARNING) {
g_printerr ("WARNING : %s\n", message); g_printerr ("WARNING : %s\n", message);
} }
} }
int LLVMFuzzerTestOneInput(const guint8 *data, size_t size) int
LLVMFuzzerTestOneInput (const guint8 * data, size_t size)
{ {
GError *err = NULL; GError *err = NULL;
GstDiscoverer *dc; GstDiscoverer *dc;
@ -94,20 +94,20 @@ int LLVMFuzzerTestOneInput(const guint8 *data, size_t size)
if (!initialized) { if (!initialized) {
/* We want critical warnings to assert so we can fix them */ /* We want critical warnings to assert so we can fix them */
g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
g_log_set_default_handler (custom_logger, NULL); g_log_set_default_handler (custom_logger, NULL);
/* Only initialize and register plugins once */ /* Only initialize and register plugins once */
gst_init (NULL, NULL); gst_init (NULL, NULL);
#ifndef LOCAL_FUZZ_BUILD #ifndef LOCAL_FUZZ_BUILD
GST_PLUGIN_STATIC_REGISTER(coreelements); GST_PLUGIN_STATIC_REGISTER (coreelements);
GST_PLUGIN_STATIC_REGISTER(playback); GST_PLUGIN_STATIC_REGISTER (playback);
GST_PLUGIN_STATIC_REGISTER(typefindfunctions); GST_PLUGIN_STATIC_REGISTER (typefindfunctions);
GST_PLUGIN_STATIC_REGISTER(app); GST_PLUGIN_STATIC_REGISTER (app);
GST_PLUGIN_STATIC_REGISTER(ogg); GST_PLUGIN_STATIC_REGISTER (ogg);
GST_PLUGIN_STATIC_REGISTER(theora); GST_PLUGIN_STATIC_REGISTER (theora);
GST_PLUGIN_STATIC_REGISTER(vorbis); GST_PLUGIN_STATIC_REGISTER (vorbis);
#endif #endif
initialized = TRUE; initialized = TRUE;
@ -134,5 +134,4 @@ int LLVMFuzzerTestOneInput(const guint8 *data, size_t size)
g_object_unref (dc); g_object_unref (dc);
return 0; return 0;
} }

View file

@ -44,14 +44,12 @@ GST_PLUGIN_STATIC_DECLARE (app);
* *
**/ **/
static void static void
custom_logger (const gchar *log_domain, custom_logger (const gchar * log_domain,
GLogLevelFlags log_level, GLogLevelFlags log_level, const gchar * message, gpointer unused_data)
const gchar *message,
gpointer unused_data)
{ {
if (log_level & G_LOG_LEVEL_CRITICAL) { if (log_level & G_LOG_LEVEL_CRITICAL) {
g_printerr ("CRITICAL ERROR : %s\n", message); g_printerr ("CRITICAL ERROR : %s\n", message);
abort(); abort ();
} else if (log_level & G_LOG_LEVEL_WARNING) { } else if (log_level & G_LOG_LEVEL_WARNING) {
g_printerr ("WARNING : %s\n", message); g_printerr ("WARNING : %s\n", message);
} }
@ -69,7 +67,7 @@ LLVMFuzzerTestOneInput (const guint8 * data, size_t size)
if (!initialized) { if (!initialized) {
/* We want critical warnings to assert so we can fix them */ /* We want critical warnings to assert so we can fix them */
g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
g_log_set_default_handler (custom_logger, NULL); g_log_set_default_handler (custom_logger, NULL);
/* Only initialize and register plugins once */ /* Only initialize and register plugins once */