[vlc-commits] input: spelling of "compare"
Rémi Denis-Courmont
git at videolan.org
Mon Nov 21 20:17:56 CET 2016
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Nov 21 21:17:37 2016 +0200| [62772733f376f1d866ff7b4dcd3aff780fe220ee] | committer: Rémi Denis-Courmont
input: spelling of "compare"
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=62772733f376f1d866ff7b4dcd3aff780fe220ee
---
include/vlc_input_item.h | 6 +++---
src/input/access.c | 2 +-
src/input/item.c | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/vlc_input_item.h b/include/vlc_input_item.h
index 8e1184f..b06f8e2 100644
--- a/include/vlc_input_item.h
+++ b/include/vlc_input_item.h
@@ -163,7 +163,7 @@ struct input_item_slave
char psz_uri[]; /**< Slave mrl */
};
-typedef int (*input_item_compar_cb)( input_item_t *, input_item_t * );
+typedef int (*input_item_compare_cb)( input_item_t *, input_item_t * );
struct input_item_node_t
{
@@ -171,7 +171,7 @@ struct input_item_node_t
int i_children;
input_item_node_t **pp_children;
input_item_node_t *p_parent;
- input_item_compar_cb compar_cb;
+ input_item_compare_cb compar_cb;
};
VLC_API void input_item_CopyOptions( input_item_t *p_child, input_item_t *p_parent );
@@ -210,7 +210,7 @@ VLC_API void input_item_node_AppendNode( input_item_node_t *p_parent, input_item
* Sort all p_item children of the node recursively.
*/
VLC_API void input_item_node_Sort( input_item_node_t *p_node,
- input_item_compar_cb compar_cb );
+ input_item_compare_cb compar_cb );
/**
* Delete a node created with input_item_node_Create() and all its children.
diff --git a/src/input/access.c b/src/input/access.c
index 22d9582..7b5363a 100644
--- a/src/input/access.c
+++ b/src/input/access.c
@@ -359,7 +359,7 @@ static int compar_version(input_item_t *p1, input_item_t *p2)
static void fsdir_sort(struct access_fsdir *p_fsdir)
{
- input_item_compar_cb pf_compar = NULL;
+ input_item_compare_cb pf_compar = NULL;
if (p_fsdir->psz_sort != NULL)
{
diff --git a/src/input/item.c b/src/input/item.c
index 37cc658..1c9c7c5 100644
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -1284,12 +1284,12 @@ static int compar_node( const void *p1, const void *p2 )
assert( p_node1->p_parent && p_node1->p_parent == p_node2->p_parent &&
p_node1->p_parent->compar_cb );
- input_item_compar_cb compar_cb = p_node1->p_parent->compar_cb;
+ input_item_compare_cb compar_cb = p_node1->p_parent->compar_cb;
return compar_cb( p_node1->p_item, p_node2->p_item );
}
static void sort_subitems( input_item_node_t *p_node,
- input_item_compar_cb compar_cb )
+ input_item_compare_cb compar_cb )
{
if( p_node->i_children <= 0 || !compar_cb )
return;
@@ -1317,7 +1317,7 @@ static void sort_subitems( input_item_node_t *p_node,
}
void input_item_node_Sort( input_item_node_t *p_node,
- input_item_compar_cb compar_cb )
+ input_item_compare_cb compar_cb )
{
sort_subitems( p_node, compar_cb );
}
More information about the vlc-commits
mailing list