usergreen
/
terminology
forked from enlightenment/terminology
1
0
Fork 0
Code Pull Requests Activity

remove condition on if (X) eina_stringshare_del(X)

This commit is contained in:
Boris Faure 2019-11-29 19:59:57 +01:00
parent 2e75539fb9
commit a5aaeefc18
Signed by untrusted user who does not match committer: borisfaure
GPG Key ID: EAA9CD729F522998
5 changed files with 46 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/media.c
View File

@ -964,8 +964,8 @@ _smart_del(Evas_Object *obj)
if (sd->realf) unlink(sd->realf); if (sd->realf) unlink(sd->realf);
close(sd->tmpfd); close(sd->tmpfd);
} }
if (sd->src) eina_stringshare_del(sd->src); eina_stringshare_del(sd->src);
if (sd->realf) eina_stringshare_del(sd->realf); eina_stringshare_del(sd->realf);
if (sd->clip) evas_object_del(sd->clip); if (sd->clip) evas_object_del(sd->clip);
if (sd->o_img) evas_object_del(sd->o_img); if (sd->o_img) evas_object_del(sd->o_img);
if (sd->o_tmp) evas_object_del(sd->o_tmp); if (sd->o_tmp) evas_object_del(sd->o_tmp);

47
src/bin/termio.c
View File

@ -176,11 +176,8 @@ termio_user_title_set(Evas_Object *obj, const char *title)
size_t len = 0; size_t len = 0;
EINA_SAFETY_ON_NULL_RETURN(sd); EINA_SAFETY_ON_NULL_RETURN(sd);
if (sd->pty->prop.user_title) eina_stringshare_del(sd->pty->prop.user_title);
{ sd->pty->prop.user_title = NULL;
eina_stringshare_del(sd->pty->prop.user_title);
sd->pty->prop.user_title = NULL;
}
if (title) if (title)
{ {
@ -409,7 +406,7 @@ termio_config_update(Evas_Object *obj)
EINA_SAFETY_ON_NULL_RETURN(sd); EINA_SAFETY_ON_NULL_RETURN(sd);
if (sd->font.name) eina_stringshare_del(sd->font.name); eina_stringshare_del(sd->font.name);
sd->font.name = NULL; sd->font.name = NULL;
if (sd->config->font.bitmap) if (sd->config->font.bitmap)
@ -872,11 +869,8 @@ _lost_selection(void *data, Elm_Sel_Type selection)
} }
if (sd->have_sel) if (sd->have_sel)
{ {
if (sd->sel_str) eina_stringshare_del(sd->sel_str);
{ sd->sel_str = NULL;
eina_stringshare_del(sd->sel_str);
sd->sel_str = NULL;
}
termio_sel_set(sd, EINA_FALSE); termio_sel_set(sd, EINA_FALSE);
elm_object_cnp_selection_clear(sd->win, selection); elm_object_cnp_selection_clear(sd->win, selection);
termio_smart_update_queue(sd); termio_smart_update_queue(sd);
@ -906,7 +900,7 @@ termio_take_selection_text(Termio *sd, Elm_Sel_Type type, const char *text)
elm_cnp_selection_loss_callback_set(sd->win, type, elm_cnp_selection_loss_callback_set(sd->win, type,
_lost_selection, sd->self); _lost_selection, sd->self);
sd->have_sel = EINA_TRUE; sd->have_sel = EINA_TRUE;
if (sd->sel_str) eina_stringshare_del(sd->sel_str); eina_stringshare_del(sd->sel_str);
sd->sel_str = text; sd->sel_str = text;
} }
@ -1439,11 +1433,9 @@ _remove_links(Termio *sd)
{ {
Eina_Bool same_geom = EINA_FALSE; Eina_Bool same_geom = EINA_FALSE;
if (sd->link.string) eina_stringshare_del(sd->link.string);
{ sd->link.string = NULL;
eina_stringshare_del(sd->link.string);
sd->link.string = NULL;
}
sd->link.x1 = -1; sd->link.x1 = -1;
sd->link.y1 = -1; sd->link.y1 = -1;
sd->link.x2 = -1; sd->link.x2 = -1;
@ -2383,8 +2375,7 @@ _smart_mouseover_apply(Termio *sd)
goto end; goto end;
} }
if (sd->link.string) eina_stringshare_del(sd->link.string);
eina_stringshare_del(sd->link.string);
sd->link.string = eina_stringshare_add(s); sd->link.string = eina_stringshare_add(s);
if ((x1 == sd->link.x1) && (y1 == sd->link.y1) && if ((x1 == sd->link.x1) && (y1 == sd->link.y1) &&
@ -2829,13 +2820,13 @@ termio_file_send_ok(const Evas_Object *obj, const char *file)
sd->sendfile.f = fopen(file, "w"); sd->sendfile.f = fopen(file, "w");
if (sd->sendfile.f) if (sd->sendfile.f)
{ {
if (sd->sendfile.file) eina_stringshare_del(sd->sendfile.file); eina_stringshare_del(sd->sendfile.file);
sd->sendfile.file = eina_stringshare_add(file); sd->sendfile.file = eina_stringshare_add(file);
sd->sendfile.active = EINA_TRUE; sd->sendfile.active = EINA_TRUE;
termpty_write(ty, "k\n", 2); termpty_write(ty, "k\n", 2);
return EINA_TRUE; return EINA_TRUE;
} }
if (sd->sendfile.file) eina_stringshare_del(sd->sendfile.file); eina_stringshare_del(sd->sendfile.file);
sd->sendfile.file = NULL; sd->sendfile.file = NULL;
sd->sendfile.active = EINA_FALSE; sd->sendfile.active = EINA_FALSE;
termpty_write(ty, "n\n", 2); termpty_write(ty, "n\n", 2);
@ -3226,10 +3217,9 @@ _smart_del(Evas_Object *obj)
if (sd->link_do_timer) ecore_timer_del(sd->link_do_timer); if (sd->link_do_timer) ecore_timer_del(sd->link_do_timer);
if (sd->mouse_move_job) ecore_job_del(sd->mouse_move_job); if (sd->mouse_move_job) ecore_job_del(sd->mouse_move_job);
if (sd->mouseover_delay) ecore_timer_del(sd->mouseover_delay); if (sd->mouseover_delay) ecore_timer_del(sd->mouseover_delay);
if (sd->font.name) eina_stringshare_del(sd->font.name); eina_stringshare_del(sd->font.name);
if (sd->pty) termpty_free(sd->pty); if (sd->pty) termpty_free(sd->pty);
if (sd->link.string) eina_stringshare_del(sd->link.string);
eina_stringshare_del(sd->link.string);
if (sd->glayer) evas_object_del(sd->glayer); if (sd->glayer) evas_object_del(sd->glayer);
if (sd->win) if (sd->win)
evas_object_event_callback_del_full(sd->win, EVAS_CALLBACK_DEL, evas_object_event_callback_del_full(sd->win, EVAS_CALLBACK_DEL,
@ -3255,7 +3245,7 @@ _smart_del(Evas_Object *obj)
} }
sd->sendfile.active = EINA_FALSE; sd->sendfile.active = EINA_FALSE;
} }
if (sd->sel_str) eina_stringshare_del(sd->sel_str); eina_stringshare_del(sd->sel_str);
if (sd->sel_reset_job) ecore_job_del(sd->sel_reset_job); if (sd->sel_reset_job) ecore_job_del(sd->sel_reset_job);
EINA_LIST_FREE(sd->cur_chids, chid) eina_stringshare_del(chid); EINA_LIST_FREE(sd->cur_chids, chid) eina_stringshare_del(chid);
sd->sel_str = NULL; sd->sel_str = NULL;
@ -3800,11 +3790,8 @@ _smart_pty_command(void *data)
{ {
sd->sendfile.progress = 0.0; sd->sendfile.progress = 0.0;
sd->sendfile.size = 0; sd->sendfile.size = 0;
if (sd->sendfile.file) eina_stringshare_del(sd->sendfile.file);
{ sd->sendfile.file = NULL;
eina_stringshare_del(sd->sendfile.file);
sd->sendfile.file = NULL;
}
if (sd->sendfile.f) if (sd->sendfile.f)
{ {
fclose(sd->sendfile.f); fclose(sd->sendfile.f);

22
src/bin/termpty.c
View File

@ -818,9 +818,9 @@ termpty_free(Termpty *ty)
} }
if (ty->hand_exe_exit) ecore_event_handler_del(ty->hand_exe_exit); if (ty->hand_exe_exit) ecore_event_handler_del(ty->hand_exe_exit);
if (ty->hand_fd) ecore_main_fd_handler_del(ty->hand_fd); if (ty->hand_fd) ecore_main_fd_handler_del(ty->hand_fd);
if (ty->prop.title) eina_stringshare_del(ty->prop.title); eina_stringshare_del(ty->prop.title);
if (ty->prop.user_title) eina_stringshare_del(ty->prop.user_title); eina_stringshare_del(ty->prop.user_title);
if (ty->prop.icon) eina_stringshare_del(ty->prop.icon); eina_stringshare_del(ty->prop.icon);
termpty_backlog_free(ty); termpty_backlog_free(ty);
free(ty->screen); free(ty->screen);
free(ty->screen2); free(ty->screen2);
@ -1395,11 +1395,17 @@ void
termpty_block_free(Termblock *tb) termpty_block_free(Termblock *tb)
{ {
char *s; char *s;
if (tb->path) eina_stringshare_del(tb->path);
if (tb->link) eina_stringshare_del(tb->link); if (!tb)
if (tb->chid) eina_stringshare_del(tb->chid); return;
if (tb->obj) evas_object_del(tb->obj);
EINA_LIST_FREE(tb->cmds, s) free(s); eina_stringshare_del(tb->path);
eina_stringshare_del(tb->link);
eina_stringshare_del(tb->chid);
if (tb->obj)
evas_object_del(tb->obj);
EINA_LIST_FREE(tb->cmds, s)
free(s);
free(tb); free(tb);
} }

11
src/bin/termptyesc.c
View File

@ -3762,8 +3762,8 @@ _handle_esc_osc(Termpty *ty, const Eina_Unicode *c, const Eina_Unicode *ce)
if (!*p) if (!*p)
goto err; goto err;
s = eina_unicode_unicode_to_utf8(p, &len); s = eina_unicode_unicode_to_utf8(p, &len);
if (ty->prop.title) eina_stringshare_del(ty->prop.title); eina_stringshare_del(ty->prop.title);
if (ty->prop.icon) eina_stringshare_del(ty->prop.icon); eina_stringshare_del(ty->prop.icon);
if (s) if (s)
{ {
ty->prop.title = eina_stringshare_add(s); ty->prop.title = eina_stringshare_add(s);
@ -3777,14 +3777,15 @@ _handle_esc_osc(Termpty *ty, const Eina_Unicode *c, const Eina_Unicode *ce)
} }
if (ty->cb.set_title.func) if (ty->cb.set_title.func)
ty->cb.set_title.func(ty->cb.set_title.data); ty->cb.set_title.func(ty->cb.set_title.data);
if (ty->cb.set_icon.func) ty->cb.set_icon.func(ty->cb.set_icon.data); if (ty->cb.set_icon.func)
ty->cb.set_icon.func(ty->cb.set_icon.data);
break; break;
case 1: case 1:
// icon name // icon name
if (!*p) if (!*p)
goto err; goto err;
s = eina_unicode_unicode_to_utf8(p, &len); s = eina_unicode_unicode_to_utf8(p, &len);
if (ty->prop.icon) eina_stringshare_del(ty->prop.icon); eina_stringshare_del(ty->prop.icon);
if (s) if (s)
{ {
ty->prop.icon = eina_stringshare_add(s); ty->prop.icon = eina_stringshare_add(s);
@ -3801,7 +3802,7 @@ _handle_esc_osc(Termpty *ty, const Eina_Unicode *c, const Eina_Unicode *ce)
if (!*p) if (!*p)
goto err; goto err;
s = eina_unicode_unicode_to_utf8(p, &len); s = eina_unicode_unicode_to_utf8(p, &len);
if (ty->prop.title) eina_stringshare_del(ty->prop.title); eina_stringshare_del(ty->prop.title);
if (s) if (s)
{ {
ty->prop.title = eina_stringshare_add(s); ty->prop.title = eina_stringshare_add(s);

23
src/bin/win.c
View File

@ -1000,10 +1000,8 @@ win_free(Win *wn)
} }
if (wn->size_job) if (wn->size_job)
ecore_job_del(wn->size_job); ecore_job_del(wn->size_job);
if (wn->config) config_del(wn->config);
config_del(wn->config); eina_stringshare_del(wn->preedit_str);
if (wn->preedit_str)
eina_stringshare_del(wn->preedit_str);
keyin_compose_seq_reset(&wn->khdl); keyin_compose_seq_reset(&wn->khdl);
if (wn->khdl.imf) if (wn->khdl.imf)
{ {
@ -1488,11 +1486,8 @@ _imf_event_commit_cb(void *data,
termpty_write(ty, str, len); termpty_write(ty, str, len);
} }
} }
if (wn->preedit_str) eina_stringshare_del(wn->preedit_str);
{ wn->preedit_str = NULL;
eina_stringshare_del(wn->preedit_str);
wn->preedit_str = NULL;
}
} }
@ -1520,8 +1515,7 @@ _imf_event_preedit_changed_cb(void *data,
if (!preedit_string) if (!preedit_string)
return; return;
DBG("IMF preedit str '%s'", preedit_string); DBG("IMF preedit str '%s'", preedit_string);
if (wn->preedit_str) eina_stringshare_del(wn->preedit_str);
eina_stringshare_del(wn->preedit_str);
wn->preedit_str = eina_stringshare_add(preedit_string); wn->preedit_str = eina_stringshare_add(preedit_string);
free(preedit_string); free(preedit_string);
} }
@ -5629,11 +5623,8 @@ _term_free(Term *term)
ecore_timer_del(term->sendfile_progress_hide_timer); ecore_timer_del(term->sendfile_progress_hide_timer);
term->sendfile_progress_hide_timer = NULL; term->sendfile_progress_hide_timer = NULL;
} }
if (term->sendfile_dir) eina_stringshare_del(term->sendfile_dir);
{ term->sendfile_dir = NULL;
eina_stringshare_del(term->sendfile_dir);
term->sendfile_dir = NULL;
}
_popmedia_queue_free(term); _popmedia_queue_free(term);
if (term->media) if (term->media)
{ {