From: Cloudwalk Date: Sat, 3 Jul 2021 16:46:00 +0000 (-0400) Subject: Remove redundant ampersand breaking ContainerOf and List_For_Each_Entry. Make all... X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f50a1192fbe86bfdd69d3372620db0b661db5f20;p=xonotic%2Fdarkplaces.git Remove redundant ampersand breaking ContainerOf and List_For_Each_Entry. Make all current loops use List_For_Each_Entry instead --- diff --git a/cmd.c b/cmd.c index 8fef16f4..abc512ee 100644 --- a/cmd.c +++ b/cmd.c @@ -86,12 +86,8 @@ static void Cmd_Defer_f (cmd_state_t *cmd) Con_Printf("No commands are pending.\n"); else { - llist_t *pos; - List_For_Each(pos, &cbuf->deferred) - { - current = List_Entry(*pos, cmd_input_t, list); + List_For_Each_Entry(current, &cbuf->deferred, list) Con_Printf("-> In %9.2f: %s\n", current->delay, current->text); - } } } else if(Cmd_Argc(cmd) == 2 && !strcasecmp("clear", Cmd_Argv(cmd, 1))) @@ -183,7 +179,7 @@ static cmd_input_t *Cbuf_LinkGet(cmd_buf_t *cbuf, cmd_input_t *existing) ret = existing; else if(!List_Is_Empty(&cbuf->free)) { - ret = List_Entry(*cbuf->free.next, cmd_input_t, list); + ret = List_Entry(cbuf->free.next, cmd_input_t, list); ret->length = 0; ret->pending = false; } @@ -370,7 +366,7 @@ void Cbuf_AddText (cmd_state_t *cmd, const char *text) Con_Print("Cbuf_AddText: overflow\n"); else { - Cbuf_LinkCreate(cmd, &llist, (List_Is_Empty(&cbuf->start) ? NULL : List_Entry(*cbuf->start.prev, cmd_input_t, list)), text); + Cbuf_LinkCreate(cmd, &llist, (List_Is_Empty(&cbuf->start) ? NULL : List_Entry(cbuf->start.prev, cmd_input_t, list)), text); if(!List_Is_Empty(&llist)) List_Splice_Tail(&llist, &cbuf->start); } @@ -398,7 +394,7 @@ void Cbuf_InsertText (cmd_state_t *cmd, const char *text) Con_Print("Cbuf_InsertText: overflow\n"); else { - Cbuf_LinkCreate(cmd, &llist, List_Entry(*cbuf->start.next, cmd_input_t, list), text); + Cbuf_LinkCreate(cmd, &llist, List_Entry(cbuf->start.next, cmd_input_t, list), text); if(!List_Is_Empty(&llist)) List_Splice(&llist, &cbuf->start); } @@ -413,7 +409,6 @@ Cbuf_Execute_Deferred --blub */ static void Cbuf_Execute_Deferred (cmd_buf_t *cbuf) { - llist_t *pos; cmd_input_t *current; double eat; @@ -424,14 +419,13 @@ static void Cbuf_Execute_Deferred (cmd_buf_t *cbuf) return; cbuf->deferred_oldtime = host.realtime; - List_For_Each(pos, &cbuf->deferred) + List_For_Each_Entry(current, &cbuf->deferred, list) { - current = List_Entry(*pos, cmd_input_t, list); current->delay -= eat; if(current->delay <= 0) { cbuf->size += current->length; - List_Move(pos, &cbuf->start); + List_Move(¤t->list, &cbuf->start); // We must return and come back next frame or the engine will freeze. Fragile... like glass :3 return; } @@ -460,7 +454,7 @@ void Cbuf_Execute (cmd_buf_t *cbuf) * commands down. This is necessary because commands (exec, alias) * can insert data at the beginning of the text buffer */ - current = List_Entry(*cbuf->start.next, cmd_input_t, list); + current = List_Entry(cbuf->start.next, cmd_input_t, list); // Recycle memory so using WASD doesn't cause a malloc and free List_Move_Tail(¤t->list, &cbuf->free); diff --git a/common.h b/common.h index 4f5e88b3..5338d514 100644 --- a/common.h +++ b/common.h @@ -42,7 +42,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //============================================================================ -#define ContainerOf(ptr, type, member) ((type *)((char *)&(ptr) - offsetof(type, member))) +#define ContainerOf(ptr, type, member) ((type *)((char *)(ptr) - offsetof(type, member))) typedef struct sizebuf_s { diff --git a/world.c b/world.c index 26ffd9bb..5f703a5d 100644 --- a/world.c +++ b/world.c @@ -148,10 +148,10 @@ void World_UnlinkAll(world_t *world) // unlink all entities one by one grid = &world->areagrid_outside; while (grid->list.next != &grid->list) - World_UnlinkEdict(PRVM_EDICT_NUM(List_Entry(*grid->list.next, link_t, list)->entitynumber)); + World_UnlinkEdict(PRVM_EDICT_NUM(List_Entry(grid->list.next, link_t, list)->entitynumber)); for (i = 0, grid = world->areagrid;i < AREA_GRIDNODES;i++, grid++) while (grid->list.next != &grid->list) - World_UnlinkEdict(PRVM_EDICT_NUM(List_Entry(*grid->list.next, link_t, list)->entitynumber)); + World_UnlinkEdict(PRVM_EDICT_NUM(List_Entry(grid->list.next, link_t, list)->entitynumber)); } /* @@ -173,7 +173,6 @@ int World_EntitiesInBox(world_t *world, const vec3_t requestmins, const vec3_t r { prvm_prog_t *prog = world->prog; int numlist; - llist_t *pos; link_t *grid; link_t *l; prvm_edict_t *ent; @@ -216,9 +215,8 @@ int World_EntitiesInBox(world_t *world, const vec3_t requestmins, const vec3_t r if (world->areagrid_outside.list.next) { grid = &world->areagrid_outside; - List_For_Each(pos, &grid->list) + List_For_Each_Entry(l, &grid->list, list) { - l = List_Entry(*pos, link_t, list); ent = PRVM_EDICT_NUM(l->entitynumber); if (ent->priv.server->areagridmarknumber != world->areagrid_marknumber) { @@ -241,9 +239,8 @@ int World_EntitiesInBox(world_t *world, const vec3_t requestmins, const vec3_t r { if (grid->list.next) { - List_For_Each(pos, &grid->list) + List_For_Each_Entry(l, &grid->list, list) { - l = List_Entry(*pos, link_t, list); ent = PRVM_EDICT_NUM(l->entitynumber); if (ent->priv.server->areagridmarknumber != world->areagrid_marknumber) {