qulogic/libgnt

Remove -Wno-sign-compare and backport fixes from default.
release-2.x.y v2.10.11 v2.10.12 v2.11.0
2014-11-13, Elliott Sales de Andrade
63ae9824b636
Parents 690a5fc4776f
Children ebf92e57a13f6553f6d91d7e
Remove -Wno-sign-compare and backport fixes from default.
6 files changed, 12 insertions(+), 9 deletions(-)
  • +1 -1
    gntcolors.c
  • +7 -4
    gntentry.c
  • +1 -1
    gntmenu.c
  • +1 -1
    gntstyle.c
  • +1 -1
    gnttextview.c
  • +1 -1
    gntwm.c
    • --- a/gntcolors.c Mon May 12 23:32:00 2014 +0200
    +++ b/gntcolors.c Thu Nov 13 00:56:55 2014 -0500
    @@ -299,7 +299,7 @@
    {
    return (hascolors ? COLOR_PAIR(pair) :
    ((pair == GNT_COLOR_NORMAL || pair == GNT_COLOR_HIGHLIGHT_D ||
    - pair == GNT_COLOR_TITLE_D || pair == GNT_COLOR_DISABLED) ? 0 : A_STANDOUT));
    + pair == GNT_COLOR_TITLE_D || pair == GNT_COLOR_DISABLED) ? 0 : (int)A_STANDOUT));
    }
    int gnt_color_add_pair(int fg, int bg)
    --- a/gntentry.c Mon May 12 23:32:00 2014 +0200
    +++ b/gntentry.c Thu Nov 13 00:56:55 2014 -0500
    @@ -184,7 +184,7 @@
    show_suggest_dropdown(GntEntry *entry)
    {
    char *suggest = NULL;
    - int len;
    + gsize len;
    int offset = 0, x, y;
    int count = 0;
    GList *iter;
    @@ -815,7 +815,7 @@
    for (str = text; *str; str = next)
    {
    - int len;
    + gsize len;
    next = g_utf8_find_next_char(str, NULL);
    len = next - str;
    @@ -834,7 +834,7 @@
    if (entry->max && g_utf8_pointer_to_offset(entry->start, entry->end) >= entry->max)
    continue;
    - if (entry->end + len - entry->start >= entry->buffer)
    + if ((gsize)(entry->end + len - entry->start) >= entry->buffer)
    {
    /* This will cause the buffer to grow */
    char *tmp = g_strdup(entry->start);
    @@ -1184,8 +1184,11 @@
    {
    g_return_if_fail(entry->history != NULL); /* Need to set_history_length first */
    - if (g_list_length(entry->history) >= entry->histlength)
    + if (entry->histlength >= 0 &&
    + g_list_length(entry->history) >= (gsize)entry->histlength)
    + {
    return;
    + }
    entry->history = g_list_first(entry->history);
    g_free(entry->history->data);
    --- a/gntmenu.c Mon May 12 23:32:00 2014 +0200
    +++ b/gntmenu.c Thu Nov 13 00:56:55 2014 -0500
    @@ -309,7 +309,7 @@
    menu->selected = g_list_length(menu->list) - 1;
    } else if (strcmp(text, GNT_KEY_RIGHT) == 0) {
    menu->selected++;
    - if (menu->selected >= g_list_length(menu->list))
    + if ((guint)menu->selected >= g_list_length(menu->list))
    menu->selected = 0;
    } else if (strcmp(text, GNT_KEY_ENTER) == 0 ||
    strcmp(text, GNT_KEY_DOWN) == 0) {
    --- a/gntstyle.c Mon May 12 23:32:00 2014 +0200
    +++ b/gntstyle.c Thu Nov 13 00:56:55 2014 -0500
    @@ -185,7 +185,7 @@
    gsize c;
    for (i = 1; i < MAX_WORKSPACES; ++i) {
    - int j;
    + gsize j;
    GntWS *ws;
    gchar **titles;
    char group[32];
    --- a/gnttextview.c Mon May 12 23:32:00 2014 +0200
    +++ b/gnttextview.c Thu Nov 13 00:56:55 2014 -0500
    @@ -513,7 +513,7 @@
    GntTextFormatFlags flags, const char *tagname)
    {
    GntWidget *widget = GNT_WIDGET(view);
    - int fl = 0;
    + chtype fl = 0;
    const char *start, *end;
    GList *list = view->list;
    GntTextLine *line;
    --- a/gntwm.c Mon May 12 23:32:00 2014 +0200
    +++ b/gntwm.c Thu Nov 13 00:56:55 2014 -0500
    @@ -443,7 +443,7 @@
    if (pos < 0) {
    wid = g_list_last(wm->cws->list)->data;
    pos = g_list_length(wm->cws->list) - 1;
    - } else if (pos >= g_list_length(wm->cws->list)) {
    + } else if ((guint)pos >= g_list_length(wm->cws->list)) {
    wid = wm->cws->list->data;
    pos = 0;
    } else