From: nerdopolis Date: Wed, 6 Dec 2023 21:47:14 +0000 (-0500) Subject: ply-utils: rename ply_utf8_string_iterator_init to ply_utf8_string_iterator_initialize X-Git-Tag: 23.51.283~8^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5af79f4ee6ef899275b2fa33a878e525cdacde48;p=thirdparty%2Fplymouth.git ply-utils: rename ply_utf8_string_iterator_init to ply_utf8_string_iterator_initialize --- diff --git a/src/libply/ply-utils.c b/src/libply/ply-utils.c index ae50213b..cebeacc6 100644 --- a/src/libply/ply-utils.c +++ b/src/libply/ply-utils.c @@ -790,10 +790,10 @@ ply_utf8_string_get_byte_offset_from_character_offset (const char *string, } void -ply_utf8_string_iterator_init (ply_utf8_string_iterator_t *iterator, - const char *string, - ssize_t starting_offset, - ssize_t range) +ply_utf8_string_iterator_initialize (ply_utf8_string_iterator_t *iterator, + const char *string, + ssize_t starting_offset, + ssize_t range) { size_t byte_offset; diff --git a/src/libply/ply-utils.h b/src/libply/ply-utils.h index 289d3a3f..3e487b4e 100644 --- a/src/libply/ply-utils.h +++ b/src/libply/ply-utils.h @@ -127,10 +127,10 @@ int ply_utf8_string_get_length (const char *string, size_t ply_utf8_string_get_byte_offset_from_character_offset (const char *string, size_t character_offset); -void ply_utf8_string_iterator_init (ply_utf8_string_iterator_t *iterator, - const char *string, - ssize_t starting_offset, - ssize_t range); +void ply_utf8_string_iterator_initialize (ply_utf8_string_iterator_t *iterator, + const char *string, + ssize_t starting_offset, + ssize_t range); bool ply_utf8_string_iterator_next (ply_utf8_string_iterator_t *iterator, const char **character, size_t *size); diff --git a/src/plugins/controls/label-freetype/plugin.c b/src/plugins/controls/label-freetype/plugin.c index 487abcd3..7cf9ce73 100644 --- a/src/plugins/controls/label-freetype/plugin.c +++ b/src/plugins/controls/label-freetype/plugin.c @@ -246,10 +246,10 @@ size_control (ply_label_plugin_control_t *label) label->rich_text, &label->span); } else { - ply_utf8_string_iterator_init (&utf8_string_iterator, - label->text, - 0, - ply_utf8_string_get_length (label->text, strlen (label->text))); + ply_utf8_string_iterator_initialize (&utf8_string_iterator, + label->text, + 0, + ply_utf8_string_get_length (label->text, strlen (label->text))); } label->area.width = 0; label->area.height = 0; @@ -454,10 +454,10 @@ draw_control (ply_label_plugin_control_t *label, label->rich_text, &label->span); } else { - ply_utf8_string_iterator_init (&utf8_string_iterator, - label->text, - 0, - ply_utf8_string_get_length (label->text, strlen (label->text))); + ply_utf8_string_iterator_initialize (&utf8_string_iterator, + label->text, + 0, + ply_utf8_string_get_length (label->text, strlen (label->text))); } target = ply_pixel_buffer_get_argb32_data (pixel_buffer);