diff options
| author | treectrl <treectrl> | 2005-09-07 20:35:30 (GMT) |
|---|---|---|
| committer | treectrl <treectrl> | 2005-09-07 20:35:30 (GMT) |
| commit | 9332eca77a4688d640554af94b1323a72275e33d (patch) | |
| tree | 88ee0ca6a5a209469e8d789b6cfc5aa023945d24 /generic/tkTreeUtils.c | |
| parent | b8a26f961bd88a69bf548bf99f9895f41aae3604 (diff) | |
| download | tktreectrl-9332eca77a4688d640554af94b1323a72275e33d.zip tktreectrl-9332eca77a4688d640554af94b1323a72275e33d.tar.gz tktreectrl-9332eca77a4688d640554af94b1323a72275e33d.tar.bz2 | |
Removed wipefree() function.
Replaced wipefree() calls with WIPEFREE().
AllocHax_Free(): replaced memset() with WIPE().
Diffstat (limited to 'generic/tkTreeUtils.c')
| -rw-r--r-- | generic/tkTreeUtils.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/generic/tkTreeUtils.c b/generic/tkTreeUtils.c index d71e9bf..13f3761 100644 --- a/generic/tkTreeUtils.c +++ b/generic/tkTreeUtils.c @@ -5,7 +5,7 @@ * * Copyright (c) 2002-2005 Tim Baker * - * RCS: @(#) $Id: tkTreeUtils.c,v 1.31 2005/07/15 01:27:41 treectrl Exp $ + * RCS: @(#) $Id: tkTreeUtils.c,v 1.32 2005/09/07 20:35:30 treectrl Exp $ */ #include "tkTreeCtrl.h" @@ -51,12 +51,6 @@ Tk_ObjCustomOption PadAmountOption = { PadAmountOptionFree }; -void wipefree(char *memPtr, int size) -{ - memset(memPtr, 0xAA, size); - ckfree(memPtr); -} - void FormatResult(Tcl_Interp *interp, char *fmt, ...) { va_list ap; @@ -633,7 +627,7 @@ void Tree_DrawBitmapWithGC(TreeCtrl *tree, Pixmap bitmap, Drawable drawable, GC gc, int src_x, int src_y, int width, int height, int dest_x, int dest_y) { #ifdef WIN32 - TkpClipMask *clipPtr = (TkpClipMask *) gc->clip_mask; + TkpClipMask *clipPtr = (TkpClipMask *) gc->clip_mask; #endif XSetClipOrigin(tree->display, gc, dest_x, dest_y); #ifdef WIN32 @@ -1697,7 +1691,7 @@ void PerStateInfo_Free( AllocHax_CFree(tree->allocData, (char *) pInfo->data, typePtr->size, pInfo->count, 5); #else - wipefree((char *) pInfo->data, typePtr->size * pInfo->count); + WIPEFREE(pInfo->data, typePtr->size * pInfo->count); #endif pInfo->data = NULL; pInfo->count = 0; @@ -1742,7 +1736,7 @@ int PerStateInfo_FromObj( AllocHax_CFree(tree->allocData, (char *) pData, typePtr->size, 1, 5); #else - wipefree((char *) pData, typePtr->size); + WIPEFREE(pData, typePtr->size); #endif return TCL_ERROR; } @@ -1791,7 +1785,7 @@ freeIt: AllocHax_CFree(tree->allocData, (char *) pInfo->data, typePtr->size, objc / 2, 5); #else - wipefree((char *) pInfo->data, typePtr->size * (objc / 2)); + WIPEFREE(pInfo->data, typePtr->size * (objc / 2)); #endif pInfo->data = NULL; pInfo->count = 0; @@ -2508,8 +2502,7 @@ void AllocHax_Free(ClientData data, char *ptr, int size) while (freeList != NULL && freeList->size != size) freeList = freeList->next; -/* WFREE */ -memset(ptr, 0xAA, size); + WIPE(ptr, size); elem->next = freeList->head; elem->free = 1; freeList->head = elem; |