zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-09 11:50:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

replace str->str & g_string_free with g_string_free_and_steal

Browse source 
solving unused warning in GLib 2.76
This commit is contained in:
Ailin Nemui 2025-07-22 11:40:04 +02:00
commit 8eee36d1ea
20 changed files with 73 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/fe-common/core/completion.c
View file

@ -111,8 +111,7 @@ char *auto_word_complete(const char *line, int *pos)
*pos = startpos+strlen(replace);
g_string_insert(result, startpos, replace);
ret = result->str;
g_string_free(result, FALSE);
ret = g_string_free_and_steal(result);
}
g_free(word);
@ -290,8 +289,7 @@ char *word_complete(WINDOW_REC *window, const char *line, int *pos, int erase, i
g_free_not_null(last_line);
last_line = g_strdup(result->str);
ret = result->str;
g_string_free(result, FALSE);
ret = g_string_free_and_steal(result);
/* free the data */
g_free(data);

3
src/fe-common/core/fe-log.c
View file

@ -214,8 +214,7 @@ static char *log_items_get_list(LOG_REC *log)
if(rec->servertag != NULL)
g_string_append_printf(str, " (%s)", rec->servertag);
ret = str->str;
g_string_free(str, FALSE);
ret = g_string_free_and_steal(str);
return ret;
}

8
src/fe-common/core/fe-messages.c
View file

@ -133,8 +133,7 @@ char *expand_emphasis(WI_ITEM_REC *item, const char *text)
}
}
ret = str->str;
g_string_free(str, FALSE);
ret = g_string_free_and_steal(str);
return ret;
}
@ -730,9 +729,8 @@ static void sig_nicklist_new(CHANNEL_REC *channel, NICK_REC *nick)
n++;
} while (printnick_exists(firstnick, nick, newnick->str));
g_hash_table_insert(printnicks, nick, newnick->str);
g_string_free(newnick, FALSE);
g_free(nickhost);
g_hash_table_insert(printnicks, nick, g_string_free_and_steal(newnick));
g_free(nickhost);
}
static void sig_nicklist_remove(CHANNEL_REC *channel, NICK_REC *nick)

12
src/fe-common/core/formats.c
View file

@ -616,8 +616,7 @@ char *format_string_expand(const char *text, int *flags)
text++;
}
ret = out->str;
g_string_free(out, FALSE);
ret = g_string_free_and_steal(out);
return ret;
}
@ -792,8 +791,7 @@ static char *format_get_text_args(TEXT_DEST_REC *dest,
text++;
}
ret = out->str;
g_string_free(out, FALSE);
ret = g_string_free_and_steal(out);
return ret;
}
@ -888,8 +886,7 @@ char *format_add_linestart(const char *text, const char *linestart)
text++;
}
ret = str->str;
g_string_free(str, FALSE);
ret = g_string_free_and_steal(str);
return ret;
}
@ -913,8 +910,7 @@ char *format_add_lineend(const char *text, const char *linestart)
}
g_string_append(str, linestart);
ret = str->str;
g_string_free(str, FALSE);
ret = g_string_free_and_steal(str);
return ret;
}

3
src/fe-common/core/hilight-text.c
View file

@ -469,8 +469,7 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text,
}
g_string_append(str, text + pos);
newstr = str->str;
g_string_free(str, FALSE);
newstr = g_string_free_and_steal(str);
format_dest_meta_stash(dest, "hilight-start",
tmp = g_strdup_printf("%d", hilight_start));

7
src/fe-common/core/printtext.c
View file

@ -24,6 +24,7 @@
#include <irssi/src/core/signals.h>
#include <irssi/src/core/commands.h>
#include <irssi/src/core/settings.h>
#include <irssi/src/core/misc.h>
#include <irssi/src/core/levels.h>
#include <irssi/src/core/servers.h>
@ -240,8 +241,7 @@ static char *printtext_get_args(TEXT_DEST_REC *dest, const char *str,
}
}
ret = out->str;
g_string_free(out, FALSE);
ret = g_string_free_and_steal(out);
return ret;
}
@ -270,8 +270,7 @@ static char *printtext_expand_formats(const char *str, int *flags)
}
}
ret = out->str;
g_string_free(out, FALSE);
ret = g_string_free_and_steal(out);
return ret;
}

28
src/fe-common/core/themes.c
View file

@ -395,9 +395,8 @@ char *theme_format_expand_get(THEME_REC *theme, const char **format)
(*format)++;
}
ret = str->str;
g_string_free(str, FALSE);
return ret;
ret = g_string_free_and_steal(str);
return ret;
}
static char *theme_format_expand_data_rec(THEME_REC *theme, const char **format,
@ -496,8 +495,7 @@ static char *theme_format_expand_abstract(THEME_REC *theme, const char **formatp
p++;
}
g_free(ret);
abstract = str->str;
g_string_free(str, FALSE);
abstract = g_string_free_and_steal(str);
/* abstract may itself contain abstracts or replaces */
p = abstract;
@ -568,15 +566,14 @@ static char *theme_format_expand_data_rec(THEME_REC *theme, const char **format,
}
}
/* save the last color */
if (save_last_fg != NULL)
*save_last_fg = last_fg;
if (save_last_bg != NULL)
*save_last_bg = last_bg;
/* save the last color */
if (save_last_fg != NULL)
*save_last_fg = last_fg;
if (save_last_bg != NULL)
*save_last_bg = last_bg;
ret = str->str;
g_string_free(str, FALSE);
return ret;
ret = g_string_free_and_steal(str);
return ret;
}
/* expand the data part in {abstract data} */
@ -645,9 +642,8 @@ static char *theme_format_compress_colors(THEME_REC *theme, const char *format)
}
}
ret = str->str;
g_string_free(str, FALSE);
return ret;
ret = g_string_free_and_steal(str);
return ret;
}
char *theme_format_expand(THEME_REC *theme, const char *format)