gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00
Code Issues Projects Releases Wiki Activity

Removed un-needed member in the data structure.

Browse Source
This commit is contained in:
dan
2000-04-09 02:57:39 +00:00
parent b37b0fd9f1
commit 27e161cea4
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
WINGs/data.c
View File

@@ -32,7 +32,6 @@ typedef struct W_Data {
unsigned retainCount; unsigned retainCount;
WMFreeDataProc *destructor; WMFreeDataProc *destructor;
int format; /* 0, 8, 16 or 32 */ int format; /* 0, 8, 16 or 32 */
unsigned freeData:1; /* whether the data should be released */
} W_Data; } W_Data;
@@ -57,8 +56,7 @@ WMCreateDataWithCapacity(unsigned capacity) /*FOLD00*/
aData->length = 0; aData->length = 0;
aData->retainCount = 1; aData->retainCount = 1;
aData->format = 0; aData->format = 0;
aData->freeData = 1; aData->destructor = wfree;
aData->destructor = NULL;
return aData; return aData;
} }
@@ -104,7 +102,6 @@ WMCreateDataWithBytesNoCopy(void *bytes, unsigned length, /*FOLD00*/
aData->growth = length/2 > 0 ? length/2 : 1; aData->growth = length/2 > 0 ? length/2 : 1;
aData->bytes = bytes; aData->bytes = bytes;
aData->retainCount = 1; aData->retainCount = 1;
aData->freeData = 0;
aData->format = 0; aData->format = 0;
aData->destructor = destructor; aData->destructor = destructor;
@@ -142,12 +139,8 @@ WMReleaseData(WMData *aData) /*FOLD00*/
aData->retainCount--; aData->retainCount--;
if (aData->retainCount > 0) if (aData->retainCount > 0)
return; return;
if (aData->bytes != NULL) { if (aData->bytes!=NULL && aData->destructor!=NULL) {
if (aData->destructor != NULL) { aData->destructor(aData->bytes);
aData->destructor(aData->bytes);
} else if (aData->freeData) {
wfree(aData->bytes);
}
} }
wfree(aData); wfree(aData);
} }
@@ -257,8 +250,7 @@ WMGetSubdataWithRange(WMData *aData, WMRange aRange) /*FOLD00*/
buffer = wmalloc(aRange.count); buffer = wmalloc(aRange.count);
WMGetDataBytesWithRange(aData, buffer, aRange); WMGetDataBytesWithRange(aData, buffer, aRange);
newData = WMCreateDataWithBytesNoCopy(buffer, aRange.count, NULL); newData = WMCreateDataWithBytesNoCopy(buffer, aRange.count, wfree);
newData->freeData = 1;
newData->format = aData->format; newData->format = aData->format;
return newData; return newData;