diff options
| author | dgp <dgp@users.sourceforge.net> | 2008-01-23 21:21:26 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2008-01-23 21:21:26 (GMT) |
| commit | 0631e4f3f4260d3fbc773676389783ec4d31c480 (patch) | |
| tree | a1b52e7723f15d31eb1d37d49c9cc69b7d9cf7cd /generic/tclInt.h | |
| parent | f7f6ddb4ce3ce465107777a9a2c408dd8ab473dc (diff) | |
| download | tcl-0631e4f3f4260d3fbc773676389783ec4d31c480.zip tcl-0631e4f3f4260d3fbc773676389783ec4d31c480.tar.gz tcl-0631e4f3f4260d3fbc773676389783ec4d31c480.tar.bz2 | |
Reconcile coding style issues between branches
Diffstat (limited to 'generic/tclInt.h')
| -rw-r--r-- | generic/tclInt.h | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h index 975771f..023cd69 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclInt.h,v 1.360 2008/01/23 19:41:28 dgp Exp $ + * RCS: @(#) $Id: tclInt.h,v 1.361 2008/01/23 21:21:31 dgp Exp $ */ #ifndef _TCLINT @@ -3506,45 +3506,45 @@ MODULE_SCOPE void TclDbInitNewObj(Tcl_Obj *objPtr); * the same growth algorithm as used in tclStringObj.c for growing * strings. The ANSI C "prototype" for this macro is: * - * EXTERN void TclGrowTokenArray _ANSI_ARGS_((Tcl_Token *tokenPtr, - * int used, int available, int append, - * Tcl_Token *staticPtr)); - * EXTERN void TclGrowParseTokenArray _ANSI_ARGS_((Tcl_Parse *parsePtr, - * int append)); + * MODULE_SCOPE void TclGrowTokenArray(Tcl_Token *tokenPtr, int used, + * int available, int append, + * Tcl_Token *staticPtr); + * MODULE_SCOPR void TclGrowParseTokenArray(Tcl_Parse *parsePtr, + * int append); *---------------------------------------------------------------- */ #define TCL_MIN_TOKEN_GROWTH 50 -#define TclGrowTokenArray(tokenPtr, used, available, append, staticPtr) \ - { \ - int needed = (used) + (append); \ - if (needed > (available)) { \ - int allocated = 2 * needed; \ - Tcl_Token *oldPtr = (tokenPtr); \ - Tcl_Token *newPtr; \ - if (oldPtr == (staticPtr)) { \ - oldPtr = NULL; \ - } \ - newPtr = (Tcl_Token *) attemptckrealloc( (char *) oldPtr, \ - (unsigned int) (allocated * sizeof(Tcl_Token)) ); \ - if (newPtr == NULL) { \ - allocated = needed + (append) + TCL_MIN_TOKEN_GROWTH; \ - newPtr = (Tcl_Token *) ckrealloc( (char *) oldPtr, \ - (unsigned int) (allocated * sizeof(Tcl_Token)) );\ - } \ - (available) = allocated; \ - if (oldPtr == NULL) { \ - memcpy((VOID *) newPtr, (VOID *) staticPtr, \ - (size_t) ((used) * sizeof(Tcl_Token))); \ - } \ - (tokenPtr) = newPtr; \ - } \ - } - -#define TclGrowParseTokenArray(parsePtr, append) \ - TclGrowTokenArray((parsePtr)->tokenPtr, (parsePtr)->numTokens, \ - (parsePtr)->tokensAvailable, (append), \ - (parsePtr)->staticTokens) +#define TclGrowTokenArray(tokenPtr, used, available, append, staticPtr) \ +{ \ + int needed = (used) + (append); \ + if (needed > (available)) { \ + int allocated = 2 * needed; \ + Tcl_Token *oldPtr = (tokenPtr); \ + Tcl_Token *newPtr; \ + if (oldPtr == (staticPtr)) { \ + oldPtr = NULL; \ + } \ + newPtr = (Tcl_Token *) attemptckrealloc( (char *) oldPtr, \ + (unsigned int) (allocated * sizeof(Tcl_Token)) ); \ + if (newPtr == NULL) { \ + allocated = needed + (append) + TCL_MIN_TOKEN_GROWTH; \ + newPtr = (Tcl_Token *) ckrealloc( (char *) oldPtr, \ + (unsigned int) (allocated * sizeof(Tcl_Token)) ); \ + } \ + (available) = allocated; \ + if (oldPtr == NULL) { \ + memcpy((VOID *) newPtr, (VOID *) staticPtr, \ + (size_t) ((used) * sizeof(Tcl_Token))); \ + } \ + (tokenPtr) = newPtr; \ + } \ +} + +#define TclGrowParseTokenArray(parsePtr, append) \ + TclGrowTokenArray((parsePtr)->tokenPtr, (parsePtr)->numTokens, \ + (parsePtr)->tokensAvailable, (append), \ + (parsePtr)->staticTokens) /* *---------------------------------------------------------------- |