aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Merge pull request #1141 from dequis/glib-deprecations

Browse Source 
Fix some glib deprecation warnings
This commit is contained in:
ailin-nemui 2019-11-19 19:41:16 +01:00 committed by GitHub
commit 942462f23f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fuzz-support/fuzz.diff
View File

@ -150,7 +150,7 @@ index ad79e0c..84d0c5c 100644
+++ b/src/fe-text/irssi.c +++ b/src/fe-text/irssi.c
@@ -314,20 +314,16 @@ int main(int argc, char **argv) @@ -314,20 +314,16 @@ int main(int argc, char **argv)
textui_finish_init(); textui_finish_init();
main_loop = g_main_new(TRUE); main_loop = g_main_loop_new(NULL, TRUE);
+#ifdef __AFL_HAVE_MANUAL_CONTROL +#ifdef __AFL_HAVE_MANUAL_CONTROL
+ __AFL_INIT(); + __AFL_INIT();
@ -162,7 +162,7 @@ index ad79e0c..84d0c5c 100644
can call our dirty-checker after each iteration */ can call our dirty-checker after each iteration */
while (!quitting) { while (!quitting) {
- term_refresh_freeze(); - term_refresh_freeze();
g_main_iteration(TRUE); g_main_context_iteration(NULL, TRUE);
- term_refresh_thaw(); - term_refresh_thaw();
- -
- if (reload_config) { - if (reload_config) {
@ -174,7 +174,7 @@ index ad79e0c..84d0c5c 100644
- dirty_check(); - dirty_check();
} }
g_main_destroy(main_loop); g_main_loop_unref(main_loop);
diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index b2478c6..cebe260 100644 index b2478c6..cebe260 100644
--- a/src/fe-text/term-terminfo.c --- a/src/fe-text/term-terminfo.c

2
src/core/commands.c
View File

@ -501,7 +501,7 @@ char *cmd_get_quoted_param(char **data)
while (**data != '\0' && (**data != quote || while (**data != '\0' && (**data != quote ||
((*data)[1] != ' ' && (*data)[1] != '\0'))) { ((*data)[1] != ' ' && (*data)[1] != '\0'))) {
if (**data == '\\' && (*data)[1] != '\0') if (**data == '\\' && (*data)[1] != '\0')
g_memmove(*data, (*data)+1, strlen(*data)); memmove(*data, (*data)+1, strlen(*data));
(*data)++; (*data)++;
} }

2
src/core/line-split.c
View File

@ -96,7 +96,7 @@ int line_split(const char *data, int len, char **output, LINEBUF_REC **buffer)
if (rec->remove > 0) { if (rec->remove > 0) {
rec->len -= rec->remove; rec->len -= rec->remove;
g_memmove(rec->str, rec->str+rec->remove, rec->len); memmove(rec->str, rec->str+rec->remove, rec->len);
rec->remove = 0; rec->remove = 0;
} }

2
src/core/net-sendbuffer.c
View File

@ -67,7 +67,7 @@ static int buffer_send(NET_SENDBUF_REC *rec)
if (ret > 0) { if (ret > 0) {
rec->bufpos -= ret; rec->bufpos -= ret;
g_memmove(rec->buffer, rec->buffer+ret, rec->bufpos); memmove(rec->buffer, rec->buffer+ret, rec->bufpos);
} }
return FALSE; return FALSE;
} }

2
src/fe-common/irc/fe-events-numeric.c
View File

@ -600,7 +600,7 @@ static void print_event_received(IRC_SERVER_REC *server, const char *data,
args = g_strdup(ptr); args = g_strdup(ptr);
ptr = strstr(args, " :"); ptr = strstr(args, " :");
if (ptr != NULL) if (ptr != NULL)
g_memmove(ptr+1, ptr+2, strlen(ptr+1)); memmove(ptr+1, ptr+2, strlen(ptr+1));
} }
recoded = recode_in(SERVER(server), args, NULL); recoded = recode_in(SERVER(server), args, NULL);

6
src/fe-none/irssi.c
View File

@ -103,9 +103,9 @@ int main(int argc, char **argv)
do { do {
reload = FALSE; reload = FALSE;
module_load(autoload_module, NULL); module_load(autoload_module, NULL);
main_loop = g_main_new(TRUE); main_loop = g_main_loop_new(NULL, TRUE);
g_main_run(main_loop); g_main_loop_run(main_loop);
g_main_destroy(main_loop); g_main_loop_unref(main_loop);
} }
while (reload); while (reload);
noui_deinit(); noui_deinit();

16
src/fe-text/gui-entry.c
View File

@ -611,12 +611,12 @@ void gui_entry_insert_text(GUI_ENTRY_REC *entry, const char *str)
entry_text_grow(entry, len); entry_text_grow(entry, len);
/* make space for the string */ /* make space for the string */
g_memmove(entry->text + entry->pos + len, entry->text + entry->pos, memmove(entry->text + entry->pos + len, entry->text + entry->pos,
(entry->text_len-entry->pos + 1) * sizeof(unichar)); (entry->text_len-entry->pos + 1) * sizeof(unichar));
/* make space for the color */ /* make space for the color */
if (entry->uses_extents) { if (entry->uses_extents) {
g_memmove(entry->extents + entry->pos + len + 1, entry->extents + entry->pos + 1, memmove(entry->extents + entry->pos + len + 1, entry->extents + entry->pos + 1,
(entry->text_len-entry->pos) * sizeof(char *)); (entry->text_len-entry->pos) * sizeof(char *));
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
entry->extents[entry->pos + i + 1] = NULL; entry->extents[entry->pos + i + 1] = NULL;
@ -662,11 +662,11 @@ void gui_entry_insert_char(GUI_ENTRY_REC *entry, unichar chr)
entry_text_grow(entry, 1); entry_text_grow(entry, 1);
/* make space for the string */ /* make space for the string */
g_memmove(entry->text + entry->pos + 1, entry->text + entry->pos, memmove(entry->text + entry->pos + 1, entry->text + entry->pos,
(entry->text_len-entry->pos + 1) * sizeof(unichar)); (entry->text_len-entry->pos + 1) * sizeof(unichar));
if (entry->uses_extents) { if (entry->uses_extents) {
g_memmove(entry->extents + entry->pos + 1 + 1, entry->extents + entry->pos + 1, memmove(entry->extents + entry->pos + 1 + 1, entry->extents + entry->pos + 1,
(entry->text_len-entry->pos) * sizeof(char *)); (entry->text_len-entry->pos) * sizeof(char *));
entry->extents[entry->pos + 1] = NULL; entry->extents[entry->pos + 1] = NULL;
} }
@ -838,7 +838,7 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
while (entry->pos-size-w > 0 && while (entry->pos-size-w > 0 &&
i_wcwidth(entry->text[entry->pos-size-w]) == 0) w++; i_wcwidth(entry->text[entry->pos-size-w]) == 0) w++;
g_memmove(entry->text + entry->pos - size, entry->text + entry->pos, memmove(entry->text + entry->pos - size, entry->text + entry->pos,
(entry->text_len-entry->pos+1) * sizeof(unichar)); (entry->text_len-entry->pos+1) * sizeof(unichar));
if (entry->uses_extents) { if (entry->uses_extents) {
@ -847,7 +847,7 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
g_free(entry->extents[i+1]); g_free(entry->extents[i+1]);
} }
} }
g_memmove(entry->extents + entry->pos - size + 1, entry->extents + entry->pos + 1, memmove(entry->extents + entry->pos - size + 1, entry->extents + entry->pos + 1,
(entry->text_len - entry->pos) * sizeof(void *)); /* no null terminator here */ (entry->text_len - entry->pos) * sizeof(void *)); /* no null terminator here */
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
entry->extents[entry->text_len - i] = NULL; entry->extents[entry->text_len - i] = NULL;
@ -876,7 +876,7 @@ void gui_entry_erase_cell(GUI_ENTRY_REC *entry)
while (entry->pos+size < entry->text_len && while (entry->pos+size < entry->text_len &&
i_wcwidth(entry->text[entry->pos+size]) == 0) size++; i_wcwidth(entry->text[entry->pos+size]) == 0) size++;
g_memmove(entry->text + entry->pos, entry->text + entry->pos + size, memmove(entry->text + entry->pos, entry->text + entry->pos + size,
(entry->text_len-entry->pos-size+1) * sizeof(unichar)); (entry->text_len-entry->pos-size+1) * sizeof(unichar));
if (entry->uses_extents) { if (entry->uses_extents) {
@ -884,7 +884,7 @@ void gui_entry_erase_cell(GUI_ENTRY_REC *entry)
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
g_free(entry->extents[entry->pos + i + 1]); g_free(entry->extents[entry->pos + i + 1]);
} }
g_memmove(entry->extents + entry->pos + 1, entry->extents + entry->pos + size + 1, memmove(entry->extents + entry->pos + 1, entry->extents + entry->pos + size + 1,
(entry->text_len-entry->pos-size) * sizeof(char *)); (entry->text_len-entry->pos-size) * sizeof(char *));
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
entry->extents[entry->text_len - i] = NULL; entry->extents[entry->text_len - i] = NULL;

6
src/fe-text/irssi.c
View File

@ -334,7 +334,7 @@ int main(int argc, char **argv)
g_log_set_always_fatal(loglev); g_log_set_always_fatal(loglev);
textui_finish_init(); textui_finish_init();
main_loop = g_main_new(TRUE); main_loop = g_main_loop_new(NULL, TRUE);
/* Does the same as g_main_run(main_loop), except we /* Does the same as g_main_run(main_loop), except we
can call our dirty-checker after each iteration */ can call our dirty-checker after each iteration */
@ -348,11 +348,11 @@ int main(int argc, char **argv)
dirty_check(); dirty_check();
term_refresh_freeze(); term_refresh_freeze();
g_main_iteration(TRUE); g_main_context_iteration(NULL, TRUE);
term_refresh_thaw(); term_refresh_thaw();
} }
g_main_destroy(main_loop); g_main_loop_unref(main_loop);
textui_deinit(); textui_deinit();
session_upgrade(); /* if we /UPGRADEd, start the new process */ session_upgrade(); /* if we /UPGRADEd, start the new process */

2
src/irc/core/bans.c
View File

@ -75,7 +75,7 @@ char *ban_get_mask(IRC_CHANNEL_REC *channel, const char *nick, int ban_type)
size = (int) (host-user); size = (int) (host-user);
if (size >= 10) { if (size >= 10) {
/* too long user mask */ /* too long user mask */
g_memmove(user+1, user+(size-9), strlen(user+(size-9))+1); memmove(user+1, user+(size-9), strlen(user+(size-9))+1);
} }
return str; return str;
} }

2
src/irc/dcc/dcc-get.c
View File

@ -477,7 +477,7 @@ static void ctcp_msg_dcc_send(IRC_SERVER_REC *server, const char *data,
if (len > 1 && *fname == '"' && fname[len-1] == '"') { if (len > 1 && *fname == '"' && fname[len-1] == '"') {
/* "file name" - MIRC sends filenames with spaces like this */ /* "file name" - MIRC sends filenames with spaces like this */
fname[len-1] = '\0'; fname[len-1] = '\0';
g_memmove(fname, fname+1, len); memmove(fname, fname+1, len);
quoted = TRUE; quoted = TRUE;
} }

2
src/irc/dcc/dcc-server.c
View File

@ -261,7 +261,7 @@ static void dcc_server_msg(SERVER_DCC_REC *dcc, const char *msg)
if (len > 1 && *fname == '"' && fname[len-1] == '"') { if (len > 1 && *fname == '"' && fname[len-1] == '"') {
/* "file name" - MIRC sends filenames with spaces like this */ /* "file name" - MIRC sends filenames with spaces like this */
fname[len-1] = '\0'; fname[len-1] = '\0';
g_memmove(fname, fname+1, len); memmove(fname, fname+1, len);
quoted = TRUE; quoted = TRUE;
} }