commit 32ac17a4ea1ad4c2f9e8c8d78dd5738958883291 from: Omar Polo date: Thu Aug 12 09:09:52 2021 UTC replace TAILQ_EMPTY/INSERT_HEAD/TAIL dance with a single TAILQ_INSERT_TAIL Now that all the queues are correctly initialised, there's no need for that dance. commit - 78894e73ecf5d7a2039e4eb6bd6e9a47fa9baa72 commit + 32ac17a4ea1ad4c2f9e8c8d78dd5738958883291 blob - 85eeb5aaa7f8fd829c100ba6bf310e716396cdfd blob + a9e7f413497fdf626deef837e1d7742ff240d69f --- cmd.c +++ cmd.c @@ -522,12 +522,9 @@ cmd_tab_move_to(struct buffer *buffer) t = TAILQ_PREV(current_tab, tabshead, tabs); TAILQ_REMOVE(&tabshead, current_tab, tabs); - if (t == NULL) { - if (TAILQ_EMPTY(&tabshead)) - TAILQ_INSERT_HEAD(&tabshead, current_tab, tabs); - else - TAILQ_INSERT_TAIL(&tabshead, current_tab, tabs); - } else + if (t == NULL) + TAILQ_INSERT_TAIL(&tabshead, current_tab, tabs); + else TAILQ_INSERT_BEFORE(t, current_tab, tabs); } blob - 18184254fabfbd1c64d0ef4ec85b7d3247f8566a blob + f094c9a83f03a21c9e04f535a7593ccbd7ce34d8 --- help.c +++ help.c @@ -46,10 +46,7 @@ emit_help_item(char *prfx, interactivefn *fn) l->line = strdup(prfx); l->alt = (char*)cmd->cmd; - if (TAILQ_EMPTY(&helpwin.page.head)) - TAILQ_INSERT_HEAD(&helpwin.page.head, l, lines); - else - TAILQ_INSERT_TAIL(&helpwin.page.head, l, lines); + TAILQ_INSERT_TAIL(&helpwin.page.head, l, lines); } static void blob - 2f6cfe02b84a2f7e67a0cec749ffa391b82e9bce blob + 4c4c7628d1ebf6e9678bda4c3cd756dc45ec7b41 --- hist.c +++ hist.c @@ -34,8 +34,5 @@ void hist_push(struct histhead *head, struct hist *h) { head->len++; - if (TAILQ_EMPTY(&head->head)) - TAILQ_INSERT_HEAD(&head->head, h, entries); - else - TAILQ_INSERT_TAIL(&head->head, h, entries); + TAILQ_INSERT_TAIL(&head->head, h, entries); } blob - 5e53dbbd49c5364e3ba56db2db00f18b916b9515 blob + 697a6d48e0bf491819a293bb15a8a1d54fefc2bc --- keymap.c +++ keymap.c @@ -183,10 +183,7 @@ again: entry->key = k; TAILQ_INIT(&entry->map.m); - if (TAILQ_EMPTY(&map->m)) - TAILQ_INSERT_HEAD(&map->m, entry, keymaps); - else - TAILQ_INSERT_TAIL(&map->m, entry, keymaps); + TAILQ_INSERT_TAIL(&map->m, entry, keymaps); if (*key != '\0') { map = &entry->map; blob - aca7b82cce72e566b5a8c74f9760dc8ef4ef6be0 blob + e9d7d6511c8937cf42d4049494201e702d9e2c62 --- minibuffer.c +++ minibuffer.c @@ -119,10 +119,7 @@ minibuffer_hist_save_entry(void) strlcpy(hist->h, ministate.buf, sizeof(hist->h)); - if (TAILQ_EMPTY(&ministate.history->head)) - TAILQ_INSERT_HEAD(&ministate.history->head, hist, entries); - else - TAILQ_INSERT_TAIL(&ministate.history->head, hist, entries); + TAILQ_INSERT_TAIL(&ministate.history->head, hist, entries); ministate.history->len++; } @@ -388,10 +385,7 @@ populate_compl_buffer(complfn *fn, void *data) if ((l->line = strdup(s)) == NULL) abort(); - if (TAILQ_EMPTY(&p->head)) - TAILQ_INSERT_HEAD(&p->head, l, lines); - else - TAILQ_INSERT_TAIL(&p->head, l, lines); + TAILQ_INSERT_TAIL(&p->head, l, lines); linedata = NULL; descr = NULL; blob - f002f366333fe9d90d1f6315f26cf21345b35417 blob + 18b733769b1ae829dc232a0a9e2258a91cec3b2b --- parser_gemtext.c +++ parser_gemtext.c @@ -107,10 +107,7 @@ emit_line(struct parser *p, enum line_type type, char break; } - if (TAILQ_EMPTY(&p->head)) - TAILQ_INSERT_HEAD(&p->head, l, lines); - else - TAILQ_INSERT_TAIL(&p->head, l, lines); + TAILQ_INSERT_TAIL(&p->head, l, lines); return 1; } blob - 158474cd2e020bb2d416f38db1d06cddd8ac831a blob + fa386a8047ec2f02e430d870cf15f532fe6e235a --- parser_gophermap.c +++ parser_gophermap.c @@ -113,10 +113,7 @@ emit_line(struct parser *p, enum line_type type, struc break; } - if (TAILQ_EMPTY(&p->head)) - TAILQ_INSERT_HEAD(&p->head, l, lines); - else - TAILQ_INSERT_TAIL(&p->head, l, lines); + TAILQ_INSERT_TAIL(&p->head, l, lines); return 1; blob - f013891db2c25c1d149f6c5f7e6b0de4fef47b33 blob + 36c5cdb9eee74c010f5071e674d032e0227a1792 --- parser_textpatch.c +++ parser_textpatch.c @@ -87,10 +87,7 @@ tpatch_emit_line(struct parser *p, const char *line, s p->flags &= ~PARSER_IN_PATCH_HDR; } - if (TAILQ_EMPTY(&p->head)) - TAILQ_INSERT_HEAD(&p->head, l, lines); - else - TAILQ_INSERT_TAIL(&p->head, l, lines); + TAILQ_INSERT_TAIL(&p->head, l, lines); return 1; } blob - c20f05207312a51295e9e0eb4d1a5e63b9e00beb blob + 325e06eff619f6c4962579e5ca7b96d7e5118adc --- parser_textplain.c +++ parser_textplain.c @@ -47,10 +47,7 @@ emit_line(struct parser *p, const char *line, size_t l memcpy(l->line, line, len); } - if (TAILQ_EMPTY(&p->head)) - TAILQ_INSERT_HEAD(&p->head, l, lines); - else - TAILQ_INSERT_TAIL(&p->head, l, lines); + TAILQ_INSERT_TAIL(&p->head, l, lines); return 1; } blob - 050a5fa1ebc70cd93ef73a75ccb0583cd311536b blob + 0b5bd9a84eec6b43c96809bd50b478ffefcddee6 --- ui.c +++ ui.c @@ -1003,12 +1003,8 @@ new_tab(const char *url, const char *base, struct tab if (after != NULL) TAILQ_INSERT_AFTER(&tabshead, after, tab, tabs); - else { - if (TAILQ_EMPTY(&tabshead)) - TAILQ_INSERT_HEAD(&tabshead, tab, tabs); - else - TAILQ_INSERT_TAIL(&tabshead, tab, tabs); - } + else + TAILQ_INSERT_TAIL(&tabshead, tab, tabs); load_url_in_tab(tab, url, base, 0); return tab; blob - 53ac51e380d2dd0753035cb4e7c0b2970f4cbf97 blob + eaa49c78a3af9ee0b7913dfab5e7eefd6c02e1ab --- wrap.c +++ wrap.c @@ -112,10 +112,7 @@ push_line(struct buffer *buffer, struct line *l, const memcpy(vl->line, buf, len); vl->flags = flags; - if (TAILQ_EMPTY(&buffer->head)) - TAILQ_INSERT_HEAD(&buffer->head, vl, vlines); - else - TAILQ_INSERT_TAIL(&buffer->head, vl, vlines); + TAILQ_INSERT_TAIL(&buffer->head, vl, vlines); return 1; }