From: Eric Leblond Date: Mon, 9 Jun 2025 08:07:04 +0000 (+0200) Subject: datasets: rename function X-Git-Tag: suricata-8.0.0-rc1~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=449d6fe60736df90b1d14c32251df327f51bced2;p=thirdparty%2Fsuricata.git datasets: rename function DatasetCreateOrGet was in fact doing get or create. --- diff --git a/src/datasets-context-json.c b/src/datasets-context-json.c index 6ddc0a3139..90f74ef0b6 100644 --- a/src/datasets-context-json.c +++ b/src/datasets-context-json.c @@ -634,7 +634,7 @@ Dataset *DatajsonGet(const char *name, enum DatasetTypes type, const char *load, { Dataset *set = NULL; - int ret = DatasetCreateOrGet(name, type, NULL, load, &memcap, &hashsize, &set); + int ret = DatasetGetOrCreate(name, type, NULL, load, &memcap, &hashsize, &set); if (ret < 0) { SCLogError("dataset with JSON %s creation failed", name); return NULL; diff --git a/src/datasets.c b/src/datasets.c index 1d6bafeb0e..9421def484 100644 --- a/src/datasets.c +++ b/src/datasets.c @@ -366,7 +366,7 @@ static void DatasetUpdateHashsize(const char *name, uint32_t hash_size) * * dataset global lock is held after return if set is found or created */ -int DatasetCreateOrGet(const char *name, enum DatasetTypes type, const char *save, const char *load, +int DatasetGetOrCreate(const char *name, enum DatasetTypes type, const char *save, const char *load, uint64_t *memcap, uint32_t *hashsize, Dataset **ret_set) { uint64_t default_memcap = 0; @@ -460,7 +460,7 @@ Dataset *DatasetGet(const char *name, enum DatasetTypes type, const char *save, { Dataset *set = NULL; - int ret = DatasetCreateOrGet(name, type, save, load, &memcap, &hashsize, &set); + int ret = DatasetGetOrCreate(name, type, save, load, &memcap, &hashsize, &set); if (ret < 0) { SCLogError("dataset %s creation failed", name); return NULL; diff --git a/src/datasets.h b/src/datasets.h index ce29ac7b3d..4207b865e3 100644 --- a/src/datasets.h +++ b/src/datasets.h @@ -68,7 +68,7 @@ Dataset *DatasetSearchByName(const char *name); Dataset *DatasetFind(const char *name, enum DatasetTypes type); Dataset *DatasetGet(const char *name, enum DatasetTypes type, const char *save, const char *load, uint64_t memcap, uint32_t hashsize); -int DatasetCreateOrGet(const char *name, enum DatasetTypes type, const char *save, const char *load, +int DatasetGetOrCreate(const char *name, enum DatasetTypes type, const char *save, const char *load, uint64_t *memcap, uint32_t *hashsize, Dataset **ret_set); int DatasetAdd(Dataset *set, const uint8_t *data, const uint32_t data_len); int DatasetRemove(Dataset *set, const uint8_t *data, const uint32_t data_len);