From: Dale Weiler Date: Wed, 14 Aug 2013 02:07:12 +0000 (+0000) Subject: Some typos X-Git-Tag: v0.3.0~34 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=90e2e5a4ad11147fb8e76d112b24aac096f93897;p=xonotic%2Fgmqcc.git Some typos --- diff --git a/conout.c b/conout.c index 93c1ff8..7fb50b9 100644 --- a/conout.c +++ b/conout.c @@ -105,11 +105,10 @@ static const int ansi2win[] = { static int win_fputs(FILE *h, const char *str) { /* state for translate */ - int acolor; - int wcolor; - int icolor; - - int state = 0; + int acolor = 0; + int wcolor = 0; + int icolor = 0; + int state = 0; /* attributes */ int intense = -1; @@ -199,9 +198,9 @@ static con_t console; */ static void con_enablecolor(void) { if (console.handle_err == stderr || console.handle_err == stdout) - console.color_err = !!(isatty(STDERR_FILENO)); + console.color_err = true; /*!!(isatty(STDERR_FILENO));*/ if (console.handle_out == stderr || console.handle_out == stdout) - console.color_out = !!(isatty(STDOUT_FILENO)); + console.color_out = true; /*!!(isatty(STDOUT_FILENO));*/ } /* diff --git a/fold.c b/fold.c index 01e6cd0..e41fd52 100644 --- a/fold.c +++ b/fold.c @@ -556,7 +556,7 @@ ast_expression *fold_op(fold_t *fold, const oper_info *info, ast_expression **op case 2: if(!b) return NULL; case 1: if(!a) { - compile_error(fold_ctx(fold), "interal error: fold_op no operands to fold\n"); + compile_error(fold_ctx(fold), "internal error: fold_op no operands to fold\n"); return NULL; } } @@ -583,7 +583,7 @@ ast_expression *fold_op(fold_t *fold, const oper_info *info, ast_expression **op case opid2('=','='): return fold_op_cmp (fold, a, b, false); case opid2('~','P'): return fold_op_bnot (fold, a); } - compile_error(fold_ctx(fold), "internal error: attempted to constant for unsupported operator"); + compile_error(fold_ctx(fold), "internal error: attempted to constant-fold for unsupported operator"); return NULL; } @@ -630,7 +630,7 @@ int fold_cond(ir_value *condval, ast_function *func, ast_ifthen *branch) { if (!ir_block_create_jump(func->curblock, ast_ctx(branch), elide)) return false; /* - * now the branch has been eliminates, and the correct block for the constant evaluation + * now the branch has been eliminated and the correct block for the constant evaluation * is expanded into the current block for the function. */ func->curblock = elide;