From 0c1699fdbb76da34d6463e631c94f34392430895 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sat, 9 Jan 2021 20:42:23 +0900 Subject: [PATCH] Fix a pile of double semicolons --- libs/ruamoko/rua_set.c | 2 +- libs/util/cmem.c | 2 +- libs/util/qendian.c | 4 ++-- libs/video/renderer/gl/gl_mod_alias.c | 2 +- libs/video/renderer/glsl/glsl_textures.c | 2 +- libs/video/renderer/r_efrag.c | 2 +- libs/video/renderer/vulkan/swapchain.c | 2 +- qtv/source/sv_parse.c | 2 +- tools/bsp2img/bsp2img.c | 4 ++-- tools/qfcc/include/dags.h | 2 +- tools/qfcc/source/class.c | 2 +- tools/qfcc/source/dags.c | 2 +- tools/qfcc/source/qfcc.c | 2 +- tools/qfcc/test/old/linkdef2.r | 2 +- tools/qflight/source/entities.c | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/libs/ruamoko/rua_set.c b/libs/ruamoko/rua_set.c index 4e3ea732d..3bc36c06b 100644 --- a/libs/ruamoko/rua_set.c +++ b/libs/ruamoko/rua_set.c @@ -392,7 +392,7 @@ bi_set_first (progs_t *pr) res->set_iters->prev = &set_iter->next; res->set_iters = set_iter; - set_iter->iter = iter;; + set_iter->iter = iter; R_INT (pr) = res_set_iter_index (res, set_iter); } diff --git a/libs/util/cmem.c b/libs/util/cmem.c index 9dc461b87..1879f7ea3 100644 --- a/libs/util/cmem.c +++ b/libs/util/cmem.c @@ -321,7 +321,7 @@ cmemalloc (memsuper_t *super, size_t size) memblock_t *block = init_block (super, mem, super->page_size); line = block->free_lines; } - return alloc_line (line, size);; + return alloc_line (line, size); } else { void *mem = 0; memsline_t **sline = &super->last_freed[ind]; diff --git a/libs/util/qendian.c b/libs/util/qendian.c index 12873af9f..9858823be 100644 --- a/libs/util/qendian.c +++ b/libs/util/qendian.c @@ -41,9 +41,9 @@ */ #ifndef WORDS_BIGENDIAN -VISIBLE qboolean bigendien = false;; +VISIBLE qboolean bigendien = false; #else -VISIBLE qboolean bigendien = true;; +VISIBLE qboolean bigendien = true; #endif diff --git a/libs/video/renderer/gl/gl_mod_alias.c b/libs/video/renderer/gl/gl_mod_alias.c index c74e1815c..44a114ff5 100644 --- a/libs/video/renderer/gl/gl_mod_alias.c +++ b/libs/video/renderer/gl/gl_mod_alias.c @@ -190,7 +190,7 @@ GL_DrawAliasFrameMulti (vert_order_t *vo) static void GL_DrawAliasShadowTri (const aliashdr_t *paliashdr, const vert_order_t *vo) { - int count = vo->count;; + int count = vo->count; const blended_vert_t *verts = vo->verts; float height, lheight; vec3_t point; diff --git a/libs/video/renderer/glsl/glsl_textures.c b/libs/video/renderer/glsl/glsl_textures.c index 62b331662..4e6303093 100644 --- a/libs/video/renderer/glsl/glsl_textures.c +++ b/libs/video/renderer/glsl/glsl_textures.c @@ -519,7 +519,7 @@ GLSL_SubpicUpdate (subpic_t *subpic, byte *data, int batch) void GLSL_ScrapFlush (scrap_t *scrap) { - vrect_t *rect = scrap->batch;; + vrect_t *rect = scrap->batch; if (!rect) return; diff --git a/libs/video/renderer/r_efrag.c b/libs/video/renderer/r_efrag.c index 74592fa30..870c01fc1 100644 --- a/libs/video/renderer/r_efrag.c +++ b/libs/video/renderer/r_efrag.c @@ -89,7 +89,7 @@ R_ClearEfrags (void) if (!efrag_list) efrag_list = calloc (1, sizeof (t_efrag_list)); - r_free_efrags = efrag_list->efrags;; + r_free_efrags = efrag_list->efrags; for (efl = efrag_list; efl; efl = efl->next) { init_efrag_list (efl); if (efl->next) diff --git a/libs/video/renderer/vulkan/swapchain.c b/libs/video/renderer/vulkan/swapchain.c index b2007953a..478700e83 100644 --- a/libs/video/renderer/vulkan/swapchain.c +++ b/libs/video/renderer/vulkan/swapchain.c @@ -43,7 +43,7 @@ QFV_CreateSwapchain (vulkan_ctx_t *ctx, VkSwapchainKHR old_swapchain) uint32_t numModes; VkPresentModeKHR *modes; - VkPresentModeKHR useMode = VK_PRESENT_MODE_FIFO_KHR;; + VkPresentModeKHR useMode = VK_PRESENT_MODE_FIFO_KHR; ifuncs->vkGetPhysicalDeviceSurfacePresentModesKHR (physDev, ctx->surface, &numModes, 0); diff --git a/qtv/source/sv_parse.c b/qtv/source/sv_parse.c index c179d125e..1b6ca5841 100644 --- a/qtv/source/sv_parse.c +++ b/qtv/source/sv_parse.c @@ -531,7 +531,7 @@ parse_player_delta (qmsg_t *msg, plent_state_t *from, plent_state_t *to) if (flags & PF_SKINNUM) to->skinnum = MSG_ReadByte (msg); if (flags & PF_EFFECTS) - to->effects = (to->effects & 0xff00) | MSG_ReadByte (msg);; + to->effects = (to->effects & 0xff00) | MSG_ReadByte (msg); if (flags & PF_WEAPONFRAME) to->weaponframe = MSG_ReadByte (msg); if (flags & PF_QF) { diff --git a/tools/bsp2img/bsp2img.c b/tools/bsp2img/bsp2img.c index 649fe1427..7b95c35a6 100644 --- a/tools/bsp2img/bsp2img.c +++ b/tools/bsp2img/bsp2img.c @@ -672,14 +672,14 @@ render_map (bsp_t *bsp) vertexlist[i].X = -vertexlist[i].X; tempf = vertexlist[i].Z; vertexlist[i].Z = vertexlist[i].Y; - vertexlist[i].Y = tempf;; + vertexlist[i].Y = tempf; break; case 2: /* +Y -- (-x <--> +x; +y out of screen, +z up) */ tempf = vertexlist[i].Z; vertexlist[i].Z = -vertexlist[i].Y; - vertexlist[i].Y = tempf;; + vertexlist[i].Y = tempf; break; case -3: /* -Z -- negate X and Z (ie. 180 rotate diff --git a/tools/qfcc/include/dags.h b/tools/qfcc/include/dags.h index 534e58511..2c677a972 100644 --- a/tools/qfcc/include/dags.h +++ b/tools/qfcc/include/dags.h @@ -89,7 +89,7 @@ typedef struct dag_s { int num_topo; ///< number of nodes in topo (may be < ///< num_nodes after dead node removal) daglabel_t **labels; ///< array of all daglabels in this dag - int num_labels;; + int num_labels; struct set_s *roots; ///< set of root nodes struct flownode_s *flownode;///< flow node this dag represents } dag_t; diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c index 52a3e194a..9203e9fbf 100644 --- a/tools/qfcc/source/class.c +++ b/tools/qfcc/source/class.c @@ -1563,7 +1563,7 @@ class_finish_module (void) save_storage = current_storage; current_storage = sc_static; current_func = begin_function (init_sym, 0, current_symtab, 1); - build_code_function (init_sym, 0, init_expr);; + build_code_function (init_sym, 0, init_expr); current_func = 0; current_storage = save_storage; } diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c index 8dec15fa2..1d98df411 100644 --- a/tools/qfcc/source/dags.c +++ b/tools/qfcc/source/dags.c @@ -500,7 +500,7 @@ static int dag_def_kill_aliases_visit (def_t *def, void *_l) { daglabel_t *l = (daglabel_t *) _l; - dagnode_t *node = l->dagnode;; + dagnode_t *node = l->dagnode; daglabel_t *label; if (def == l->op->o.def) diff --git a/tools/qfcc/source/qfcc.c b/tools/qfcc/source/qfcc.c index 96c26e4b0..e6c3b7946 100644 --- a/tools/qfcc/source/qfcc.c +++ b/tools/qfcc/source/qfcc.c @@ -189,7 +189,7 @@ InitData (void) pr.entity_data = defspace_new (ds_virtual); pr.entity_fields = new_symtab (0, stab_global); - pr.entity_fields->space = pr.entity_data;; + pr.entity_fields->space = pr.entity_data; clear_functions (); clear_frame_macros (); diff --git a/tools/qfcc/test/old/linkdef2.r b/tools/qfcc/test/old/linkdef2.r index 133235f69..20a72fa3a 100644 --- a/tools/qfcc/test/old/linkdef2.r +++ b/tools/qfcc/test/old/linkdef2.r @@ -5,5 +5,5 @@ id obj; integer foo (void) { [obj message]; - return bar () + baz ();; + return bar () + baz (); } diff --git a/tools/qflight/source/entities.c b/tools/qflight/source/entities.c index c9d262356..d2bd2711c 100644 --- a/tools/qflight/source/entities.c +++ b/tools/qflight/source/entities.c @@ -183,7 +183,7 @@ LoadEntities (void) // start parsing num_entities = PL_A_NumObjects (entity_list); - entities = malloc (num_entities * sizeof (entity_t));; + entities = malloc (num_entities * sizeof (entity_t)); // go through all the entities for (i = 0; i < num_entities; i++) {