| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 1 | Rename static functions that use GLib naming conventions as one of them |
| 2 | (g_ptr_array_insert) has now been added to GLib. |
| 3 | |
| 4 | Upstream-Status: Pending |
| 5 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 6 | |
| 7 | diff --git a/omx/gstomx_util.c b/omx/gstomx_util.c |
| 8 | index 423e441..579dbf5 100644 |
| 9 | --- a/omx/gstomx_util.c |
| 10 | +++ b/omx/gstomx_util.c |
| 11 | @@ -85,7 +85,7 @@ static gboolean initialized; |
| 12 | */ |
| 13 | |
| 14 | static void |
| 15 | -g_ptr_array_clear (GPtrArray * array) |
| 16 | +omx_g_ptr_array_clear (GPtrArray * array) |
| 17 | { |
| 18 | guint index; |
| 19 | for (index = 0; index < array->len; index++) |
| 20 | @@ -93,7 +93,7 @@ g_ptr_array_clear (GPtrArray * array) |
| 21 | } |
| 22 | |
| 23 | static void |
| 24 | -g_ptr_array_insert (GPtrArray * array, guint index, gpointer data) |
| 25 | +omx_g_ptr_array_insert (GPtrArray * array, guint index, gpointer data) |
| 26 | { |
| 27 | if (index + 1 > array->len) { |
| 28 | g_ptr_array_set_size (array, index + 1); |
| 29 | @@ -394,7 +394,7 @@ g_omx_core_unload (GOmxCore * core) |
| 30 | } |
| 31 | |
| 32 | core_for_each_port (core, g_omx_port_free); |
| 33 | - g_ptr_array_clear (core->ports); |
| 34 | + omx_g_ptr_array_clear (core->ports); |
| 35 | } |
| 36 | |
| 37 | static inline GOmxPort * |
| 38 | @@ -418,7 +418,7 @@ g_omx_core_new_port (GOmxCore * core, guint index) |
| 39 | } |
| 40 | |
| 41 | port = g_omx_port_new (core, index); |
| 42 | - g_ptr_array_insert (core->ports, index, port); |
| 43 | + omx_g_ptr_array_insert (core->ports, index, port); |
| 44 | |
| 45 | return port; |
| 46 | } |