aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/tag.c16
-rw-r--r--src/tag.h10
-rw-r--r--src/tag_internal.h2
-rw-r--r--src/tag_print.c2
4 files changed, 15 insertions, 15 deletions
diff --git a/src/tag.c b/src/tag.c
index e4aa6bf0e..bd1635310 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -62,7 +62,7 @@ const char *tag_item_names[TAG_NUM_OF_ITEM_TYPES] = {
[TAG_MUSICBRAINZ_TRACKID] = "MUSICBRAINZ_TRACKID",
};
-int8_t ignoreTagItems[TAG_NUM_OF_ITEM_TYPES];
+int8_t ignore_tag_items[TAG_NUM_OF_ITEM_TYPES];
static size_t items_size(const struct tag *tag)
{
@@ -80,14 +80,14 @@ void tag_lib_init(void)
/* parse the "metadata_to_use" config parameter below */
- memset(ignoreTagItems, 0, TAG_NUM_OF_ITEM_TYPES);
- ignoreTagItems[TAG_ITEM_COMMENT] = 1; /* ignore comments by default */
+ memset(ignore_tag_items, 0, TAG_NUM_OF_ITEM_TYPES);
+ ignore_tag_items[TAG_ITEM_COMMENT] = 1; /* ignore comments by default */
value = config_get_string(CONF_METADATA_TO_USE, NULL);
if (value == NULL)
return;
- memset(ignoreTagItems, 1, TAG_NUM_OF_ITEM_TYPES);
+ memset(ignore_tag_items, 1, TAG_NUM_OF_ITEM_TYPES);
if (0 == strcasecmp(value, "none"))
return;
@@ -100,7 +100,7 @@ void tag_lib_init(void)
*s = '\0';
for (i = 0; i < TAG_NUM_OF_ITEM_TYPES; i++) {
if (strcasecmp(c, tag_item_names[i]) == 0) {
- ignoreTagItems[i] = 0;
+ ignore_tag_items[i] = 0;
break;
}
}
@@ -453,15 +453,15 @@ tag_add_item_internal(struct tag *tag, enum tag_type type,
g_free(p);
}
-void tag_add_item_n(struct tag *tag, enum tag_type itemType,
+void tag_add_item_n(struct tag *tag, enum tag_type type,
const char *value, size_t len)
{
- if (ignoreTagItems[itemType])
+ if (ignore_tag_items[type])
{
return;
}
if (!value || !len)
return;
- tag_add_item_internal(tag, itemType, value, len);
+ tag_add_item_internal(tag, type, value, len);
}
diff --git a/src/tag.h b/src/tag.h
index 026ded5c4..34f99c0b5 100644
--- a/src/tag.h
+++ b/src/tag.h
@@ -65,7 +65,7 @@ struct tag *tag_new(void);
void tag_lib_init(void);
-void tag_clear_items_by_type(struct tag *tag, enum tag_type itemType);
+void tag_clear_items_by_type(struct tag *tag, enum tag_type type);
void tag_free(struct tag *tag);
@@ -83,13 +83,13 @@ void tag_begin_add(struct tag *tag);
*/
void tag_end_add(struct tag *tag);
-void tag_add_item_n(struct tag *tag, enum tag_type itemType,
+void tag_add_item_n(struct tag *tag, enum tag_type type,
const char *value, size_t len);
-static inline void tag_add_item(struct tag *tag, enum tag_type itemType,
- const char *value)
+static inline void
+tag_add_item(struct tag *tag, enum tag_type type, const char *value)
{
- tag_add_item_n(tag, itemType, value, strlen(value));
+ tag_add_item_n(tag, type, value, strlen(value));
}
struct tag *tag_dup(const struct tag *tag);
diff --git a/src/tag_internal.h b/src/tag_internal.h
index 1188bbcdf..2479088bc 100644
--- a/src/tag_internal.h
+++ b/src/tag_internal.h
@@ -21,6 +21,6 @@
#include <stdint.h>
-extern int8_t ignoreTagItems[TAG_NUM_OF_ITEM_TYPES];
+extern int8_t ignore_tag_items[TAG_NUM_OF_ITEM_TYPES];
#endif
diff --git a/src/tag_print.c b/src/tag_print.c
index 678965c1c..737a63f6e 100644
--- a/src/tag_print.c
+++ b/src/tag_print.c
@@ -27,7 +27,7 @@ void tag_print_types(struct client *client)
int i;
for (i = 0; i < TAG_NUM_OF_ITEM_TYPES; i++) {
- if (ignoreTagItems[i] == 0)
+ if (ignore_tag_items[i] == 0)
client_printf(client, "tagtype: %s\n",
tag_item_names[i]);
}