Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change: replace utf8_substring with g_utf8_substring #2204

Closed
wants to merge 7 commits into from
Closed

Change: replace utf8_substring with g_utf8_substring #2204

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8ffaf67
Move body of buffer_notes_xml to new function buffer_note_xml
mattmundell May 28, 2024
0a0fd31
Remove const from get_next initializer arg
mattmundell May 28, 2024
e2d4ea2
Fix: iterate with get_next in handle_get_notes
mattmundell May 28, 2024
91888c0
Move body of buffer_overrides_xml to new function buffer_override_xml
mattmundell May 28, 2024
f9a735a
Fix: iterate with get_next in handle_get_overrides
mattmundell May 28, 2024
66e4f7b
Change: replace utf8_substring with g_utf8_substring
mattmundell May 29, 2024
5dfb4c0
Merge branch 'main' into utf8-substring
mattmundell Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 2 additions & 30 deletions src/gmp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8063,33 +8063,6 @@ convert_to_newlines (const char *text)
return new;
}

/**
* @brief Get substring of UTF8 string.
*
* @param[in] str String
* @param[in] start_pos Start.
* @param[in] end_pos End.
*
* @return Substring.
*/
static gchar *
utf8_substring (const gchar *str, glong start_pos, glong end_pos)
{
gchar *start, *end, *out;

/* TODO This is a copy of g_utf8_substring from glib 2.38.2. Once our glib
* minimum goes past 2.30 we can just use g_utf8_substring. */

start = g_utf8_offset_to_pointer (str, start_pos);
end = g_utf8_offset_to_pointer (start, end_pos - start_pos);

out = g_malloc (end - start + 1);
memcpy (out, start, end - start);
out[end - start] = 0;

return out;
}

/**
* @brief Buffer XML for a single note.
*
Expand Down Expand Up @@ -8169,7 +8142,7 @@ buffer_note_xml (GString *buffer, iterator_t *notes, int include_notes_details,
const char *text;

text = note_iterator_text (notes);
excerpt = utf8_substring (text, 0, setting_excerpt_size_int ());
excerpt = g_utf8_substring (text, 0, setting_excerpt_size_int ());

/* This must match send_get_common. */

Expand Down Expand Up @@ -8467,7 +8440,7 @@ buffer_override_xml (GString *buffer, iterator_t *overrides,
const char *text;

text = override_iterator_text (overrides);
excerpt = utf8_substring (text, 0, setting_excerpt_size_int ());
excerpt = g_utf8_substring (text, 0, setting_excerpt_size_int ());

/* This must match send_get_common. */

Expand Down Expand Up @@ -18058,7 +18031,6 @@ handle_get_tasks (gmp_parser_t *gmp_parser, GError **error)
g_free (task_schedule_xml);

SENDF_TO_CLIENT_OR_FAIL ("</task>");

}
else
{
Expand Down
Loading