External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 12:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: hash: Remove virHashCreateFull

Browse Source 
The only place we call it is in virHashNew. Move the code to virHashNew
and remove virHashCreateFull.

Code wishing to use non-strings as hash table keys will be better off
using glib's GHashTable directly.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Peter Krempa 2020-10-20 18:17:16 +02:00
parent 8824fc8474
commit a2c699856a
2 changed files with 17 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/util/virhash.c
View File

@ -118,49 +118,6 @@ virHashComputeKey(const virHashTable *table, const void *name)
return value % table->size;
}
/**
* virHashCreateFull:
* @size: the size of the hash table
* @dataFree: callback to free data
* @keyCode: callback to compute hash code
* @keyEqual: callback to compare hash keys
* @keyCopy: callback to copy hash keys
* @keyFree: callback to free keys
*
* Create a new virHashTablePtr.
*
* Returns the newly created object.
*/
virHashTablePtr virHashCreateFull(ssize_t size,
virHashDataFree dataFree,
virHashKeyCode keyCode,
virHashKeyEqual keyEqual,
virHashKeyCopy keyCopy,
virHashKeyPrintHuman keyPrint,
virHashKeyFree keyFree)
{
virHashTablePtr table = NULL;
if (size <= 0)
size = 256;
table = g_new0(virHashTable, 1);
table->seed = virRandomBits(32);
table->size = size;
table->nbElems = 0;
table->dataFree = dataFree;
table->keyCode = keyCode;
table->keyEqual = keyEqual;
table->keyCopy = keyCopy;
table->keyPrint = keyPrint;
table->keyFree = keyFree;
table->table = g_new0(virHashEntryPtr, table->size);
return table;
}
/**
* virHashNew:
@ -173,13 +130,23 @@ virHashTablePtr virHashCreateFull(ssize_t size,
virHashTablePtr
virHashNew(virHashDataFree dataFree)
{
return virHashCreateFull(32,
dataFree,
virHashStrCode,
virHashStrEqual,
virHashStrCopy,
virHashStrPrintHuman,
virHashStrFree);
virHashTablePtr table = NULL;
table = g_new0(virHashTable, 1);
table->seed = virRandomBits(32);
table->size = 32;
table->nbElems = 0;
table->dataFree = dataFree;
table->keyCode = virHashStrCode;
table->keyEqual = virHashStrEqual;
table->keyCopy = virHashStrCopy;
table->keyPrint = virHashStrPrintHuman;
table->keyFree = virHashStrFree;
table->table = g_new0(virHashEntryPtr, table->size);
return table;
}

7
src/util/virhash.h
View File

@ -113,13 +113,6 @@ typedef void (*virHashKeyFree)(void *name);
*/
virHashTablePtr virHashNew(virHashDataFree dataFree);
virHashAtomicPtr virHashAtomicNew(virHashDataFree dataFree);
virHashTablePtr virHashCreateFull(ssize_t size,
virHashDataFree dataFree,
virHashKeyCode keyCode,
virHashKeyEqual keyEqual,
virHashKeyCopy keyCopy,
virHashKeyPrintHuman keyPrint,
virHashKeyFree keyFree);
void virHashFree(virHashTablePtr table);
ssize_t virHashSize(const virHashTable *table);