diff options
| author | treectrl <treectrl> | 2003-01-02 22:11:26 (GMT) |
|---|---|---|
| committer | treectrl <treectrl> | 2003-01-02 22:11:26 (GMT) |
| commit | 69c73ef73cfe1060b4db7b6e991a89baa1afb8ad (patch) | |
| tree | 9fa455c1446b37197bbec0c53b2767ff6ad25a4d /generic | |
| parent | 9772044d4e115cc7e4af194cd6cd3d93a457d07a (diff) | |
| download | tktreectrl-69c73ef73cfe1060b4db7b6e991a89baa1afb8ad.zip tktreectrl-69c73ef73cfe1060b4db7b6e991a89baa1afb8ad.tar.gz tktreectrl-69c73ef73cfe1060b4db7b6e991a89baa1afb8ad.tar.bz2 | |
Use STATIC_SIZE in more places.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkTreeCtrl.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/generic/tkTreeCtrl.c b/generic/tkTreeCtrl.c index 7a3d30c..a8db599 100644 --- a/generic/tkTreeCtrl.c +++ b/generic/tkTreeCtrl.c @@ -1809,7 +1809,8 @@ static int TreeSelectionCmd(Tcl_Interp *interp, TreeCtrl *tree, int objc, Tcl_Ob case COMMAND_ADD: { int indexFirst, indexLast, count; - TreeItem staticItems[20], *items = staticItems; +#define STATIC_SIZE 20 + TreeItem staticItems[STATIC_SIZE], *items = staticItems; Tcl_HashEntry *hPtr; Tcl_HashSearch search; @@ -1829,7 +1830,7 @@ static int TreeSelectionCmd(Tcl_Interp *interp, TreeCtrl *tree, int objc, Tcl_Ob if ((itemFirst == ITEM_ALL) || (itemLast == ITEM_ALL)) { count = tree->itemCount - tree->selectCount; - if (count + 1 > sizeof(staticItems) / sizeof(staticItems[0])) + if (count + 1 > STATIC_SIZE) items = (TreeItem *) ckalloc(sizeof(TreeItem) * (count + 1)); count = 0; @@ -1877,7 +1878,7 @@ static int TreeSelectionCmd(Tcl_Interp *interp, TreeCtrl *tree, int objc, Tcl_Ob } count = indexLast - indexFirst + 1; } - if (count + 1 > sizeof(staticItems) / sizeof(staticItems[0])) + if (count + 1 > STATIC_SIZE) items = (TreeItem *) ckalloc(sizeof(TreeItem) * (count + 1)); count = 0; item = itemFirst; @@ -1925,7 +1926,7 @@ doneADD: case COMMAND_CLEAR: { int indexFirst, indexLast, count; - TreeItem staticItems[20], *items = staticItems; + TreeItem staticItems[STATIC_SIZE], *items = staticItems; Tcl_HashEntry *hPtr; Tcl_HashSearch search; @@ -1948,7 +1949,7 @@ doneADD: if ((objc == 3) || (itemFirst == ITEM_ALL) || (itemLast == ITEM_ALL)) { count = tree->selectCount; - if (count + 1 > sizeof(staticItems) / sizeof(staticItems[0])) + if (count + 1 > STATIC_SIZE) items = (TreeItem *) ckalloc(sizeof(TreeItem) * (count + 1)); count = 0; @@ -1996,7 +1997,7 @@ doneADD: } count = indexLast - indexFirst + 1; } - if (count + 1 > sizeof(staticItems) / sizeof(staticItems[0])) + if (count + 1 > STATIC_SIZE) items = (TreeItem *) ckalloc(sizeof(TreeItem) * (count + 1)); count = 0; item = itemFirst; @@ -2084,7 +2085,6 @@ doneCLEAR: Tcl_HashEntry *hPtr; Tcl_HashSearch search; TreeItem item; -#define STATIC_SIZE 20 TreeItem staticItemS[STATIC_SIZE], *itemS = staticItemS; TreeItem staticItemD[STATIC_SIZE], *itemD = staticItemD; TreeItem staticNewS[STATIC_SIZE], *newS = staticNewS; |