From 1bf4aa379a9a3bdac39c814bd8ab49493962c674 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Sat, 28 Apr 2012 10:17:32 +0200 Subject: [PATCH] Header guards and macros get {} in oneline ifs and loops --- ast.h | 4 ++-- astir.h | 21 +++++++++++++-------- ir.h | 4 ++-- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ast.h b/ast.h index 00922d6..a2b5d2c 100644 --- a/ast.h +++ b/ast.h @@ -20,8 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef GMQCC_AST_H__ -#define GMQCC_AST_H__ +#ifndef GMQCC_AST_HDR +#define GMQCC_AST_HDR #include "astir.h" #include "ir.h" diff --git a/astir.h b/astir.h index 37f7627..16c14c9 100644 --- a/astir.h +++ b/astir.h @@ -20,8 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef ASTIR_COMMON_H__ -#define ASTIR_COMMON_H__ +#ifndef GMQCC_ASTIR_HDR +#define GMQCC_ASTIR_HDR #define MEM_VECTOR_PROTO(Towner, Tmem, mem) \ bool GMQCC_WARN Towner##_##mem##_add(Towner*, Tmem); \ @@ -42,10 +42,11 @@ bool GMQCC_WARN Tself##_##mem##_add(Tself *self, Twhat f) \ { \ Twhat *reall; \ if (self->mem##_count == self->mem##_alloc) { \ - if (!self->mem##_alloc) \ + if (!self->mem##_alloc) { \ self->mem##_alloc = 16; \ - else \ + } else { \ self->mem##_alloc *= 2; \ + } \ reall = (Twhat*)mem_a(sizeof(Twhat) * self->mem##_alloc); \ if (!reall) { \ MEM_VECTOR_CLEAR(self, mem); \ @@ -64,17 +65,20 @@ bool GMQCC_WARN Tself##_##mem##_remove(Tself *self, size_t idx) \ { \ size_t i; \ Twhat *reall; \ - if (idx >= self->mem##_count) \ + if (idx >= self->mem##_count) { \ return true; /* huh... */ \ - for (i = idx; i < self->mem##_count-1; ++i) \ + } \ + for (i = idx; i < self->mem##_count-1; ++i) { \ self->mem[i] = self->mem[i+1]; \ + } \ self->mem##_count--; \ if (self->mem##_count < self->mem##_count/2) \ { \ self->mem##_alloc /= 2; \ reall = (Twhat*)mem_a(sizeof(Twhat) * self->mem##_count); \ - if (!reall) \ + if (!reall) { \ return false; \ + } \ memcpy(reall, self->mem, sizeof(Twhat) * self->mem##_count); \ mem_d(self->mem); \ self->mem = reall; \ @@ -88,8 +92,9 @@ bool GMQCC_WARN Tself##_##mem##_find(Tself *self, Twhat obj, size_t *idx) \ size_t i; \ for (i = 0; i < self->mem##_count; ++i) { \ if (self->mem[i] == obj) { \ - if (idx) \ + if (idx) { \ *idx = i; \ + } \ return true; \ } \ } \ diff --git a/ir.h b/ir.h index f58c746..49b3370 100644 --- a/ir.h +++ b/ir.h @@ -20,8 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef QCIR_H__ -#define QCIR_H__ +#ifndef GMQCC_IR_HDR +#define GMQCC_IR_HDR #include "astir.h" -- 2.39.2