# HG changeset patch # User Pavel Jank # Date 1005550120 0 # Node ID 174ef035d15668143d4d6216cdcd62e7b212d24b # Parent d43f115e04561952c2b9ccd610706ccee99c1d8f Change macros to use do-while block instead of if-else. Use braces to follow GNU Coding Standards. diff -r d43f115e0456 -r 174ef035d156 src/ccl.c --- a/src/ccl.c Mon Nov 12 06:17:38 2001 +0000 +++ b/src/ccl.c Mon Nov 12 07:28:40 2001 +0000 @@ -601,21 +601,25 @@ static int stack_idx_of_map_multiple; #define PUSH_MAPPING_STACK(restlen, orig) \ - do { \ +do \ + { \ mapping_stack_pointer->rest_length = (restlen); \ mapping_stack_pointer->orig_val = (orig); \ mapping_stack_pointer++; \ - } while (0) + } \ +while (0) #define POP_MAPPING_STACK(restlen, orig) \ - do { \ +do \ + { \ mapping_stack_pointer--; \ (restlen) = mapping_stack_pointer->rest_length; \ (orig) = mapping_stack_pointer->orig_val; \ - } while (0) + } \ +while (0) #define CCL_CALL_FOR_MAP_INSTRUCTION(symbol, ret_ic) \ -if (1) \ +do \ { \ struct ccl_program called_ccl; \ if (stack_idx >= 256 \ @@ -635,7 +639,7 @@ ic = CCL_HEADER_MAIN; \ goto ccl_repeat; \ } \ -else +while (0) #define CCL_MapSingle 0x12 /* Map by single code conversion map 1:ExtendedCOMMNDXXXRRRrrrXXXXX @@ -676,34 +680,34 @@ /* Terminate CCL program successfully. */ #define CCL_SUCCESS \ -if (1) \ +do \ { \ ccl->status = CCL_STAT_SUCCESS; \ goto ccl_finish; \ } \ -else +while(0) /* Suspend CCL program because of reading from empty input buffer or writing to full output buffer. When this program is resumed, the same I/O command is executed. */ #define CCL_SUSPEND(stat) \ -if (1) \ +do \ { \ ic--; \ ccl->status = stat; \ goto ccl_finish; \ } \ -else +while (0) /* Terminate CCL program because of invalid command. Should not occur in the normal case. */ #define CCL_INVALID_CMD \ -if (1) \ +do \ { \ ccl->status = CCL_STAT_INVALID_CMD; \ goto ccl_error_handler; \ } \ -else +while(0) /* Encode one character CH to multibyte form and write to the current output buffer. If CH is less than 256, CH is written as is. */