qulogic/talkatu

Fix up a few warnings

2018-09-11, Gary Kramlich
4ce4b5b0c622
Parents 8c37a4944ca7
Children 18d1a7dcb04f
Fix up a few warnings
2 files changed, 14 insertions(+), 8 deletions(-)
  • +13 -7
    talkatu/talkatumarkup.c
  • +1 -1
    talkatu/talkatumarkup.h
    • --- a/talkatu/talkatumarkup.c Tue Sep 11 15:23:24 2018 -0500
    +++ b/talkatu/talkatumarkup.c Tue Sep 11 15:29:26 2018 -0500
    @@ -224,23 +224,26 @@
    gchar *
    talkatu_markup_get_html_range(GtkTextBuffer *buffer,
    - GtkTextIter *start,
    - GtkTextIter *end,
    + const GtkTextIter *start,
    + const GtkTextIter *end,
    gsize *len)
    {
    GSList *stack = NULL, *l = NULL;
    - GtkTextIter *pos = NULL, *next = NULL;
    + GtkTextIter *real_start = NULL, *real_end = NULL, *pos = NULL, *next = NULL;
    GString *str = g_string_new("");
    gchar *ret = NULL;
    gunichar c;
    + real_start = gtk_text_iter_copy(start);
    + real_end = gtk_text_iter_copy(end);
    +
    /* correctly order the iterators */
    - gtk_text_iter_order(start, end);
    + gtk_text_iter_order(real_start, real_end);
    /* create a copy of the start one which is what we will use to walk the
    * buffer.
    */
    - pos = gtk_text_iter_copy(start);
    + pos = gtk_text_iter_copy(real_start);
    /* create a look ahead iter to help us tell when tags start/end */
    next = gtk_text_iter_copy(pos);
    @@ -309,7 +312,7 @@
    for(l = stack; l != NULL; l = l->next) {
    GtkTextTag *tag = GTK_TEXT_TAG(l->data);
    - if(!gtk_text_iter_ends_tag(end, tag)) {
    + if(!gtk_text_iter_ends_tag(real_end, tag)) {
    gchar *name = NULL;
    g_object_get(G_OBJECT(tag), "name", &name, NULL);
    @@ -321,7 +324,10 @@
    ret = str->str;
    g_string_free(str, FALSE);
    +
    gtk_text_iter_free(pos);
    + gtk_text_iter_free(real_start);
    + gtk_text_iter_free(real_end);
    return ret;
    }
    @@ -347,5 +353,5 @@
    gtk_text_buffer_get_bounds(buffer, &start, &end);
    - return talkatu_markup_get_html_range(buffer, &start, &end, &len);
    + return talkatu_markup_get_html_range(buffer, &start, &end, len);
    }
    --- a/talkatu/talkatumarkup.h Tue Sep 11 15:23:24 2018 -0500
    +++ b/talkatu/talkatumarkup.h Tue Sep 11 15:29:26 2018 -0500
    @@ -39,7 +39,7 @@
    guint8 *talkatu_markup_serialize_html(GtkTextBuffer *register_buffer, GtkTextBuffer *content_buffer, const GtkTextIter *start, const GtkTextIter *end, gsize *length, gpointer user_data);
    gchar *talkatu_markup_get_html(GtkTextBuffer *buffer, gsize *len);
    -gchar *talkatu_markup_get_html_range(GtkTextBuffer *buffer, GtkTextIter *start, GtkTextIter *end, gsize *len);
    +gchar *talkatu_markup_get_html_range(GtkTextBuffer *buffer, const GtkTextIter *start, const GtkTextIter *end, gsize *len);
    G_END_DECLS