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 6ddc0a31395607591b40e3681c92b2ff4b27e8a8..90f74ef0b62542d3856135be63a6a54fa1d63ca0 100644 (file)
--- 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 1d6bafeb0eb64786ebab9325f748e801609e4ac1..9421def48439ae219cbf8ce03cb5877139483455 100644 (file)
--- 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 ce29ac7b3d255bf5ea5d4d63aee7da9d166b94b7..4207b865e341a79251734d8eaa2f0b02820e7d79 100644 (file)
--- 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);