refactor(common): move ocre_is_valid_id

We will need it outside of OcreCore

Signed-off-by: Marco Casaroli <marco.casaroli@gmail.com>

Author: casaroli

src/common/CMakeLists.txt

@@ -44,17 +44,18 @@ add_custom_command(
     COMMAND cmake -E echo
 )
 
-add_library(OcreCommon INTERFACE)
+add_library(OcreCommon)
 
 # if we are not in a git repository, just fail automatically if we are missing commit_id.h
 target_sources(OcreCommon
     PRIVATE
+    common.c
     include/ocre/build_info.h
     include/ocre/commit_id.h
 )
 
 target_include_directories(OcreCommon
-    INTERFACE
+    PUBLIC
     include
     ${CMAKE_CURRENT_BINARY_DIR}/include
 )

src/common/common.c

@@ -0,0 +1,30 @@
+#include <stddef.h>
+#include <ctype.h>
+#include <string.h>
+
+int ocre_is_valid_id(const char *id)
+{
+	/* Cannot be NULL */
+
+	if (!id) {
+		return 0;
+	}
+
+	/* Cannot be empty or start with a dot '.' */
+
+	if (id[0] == '\0' || id[0] == '.') {
+		return 0;
+	}
+
+	/* Can only contain alphanumeric characters, dots, underscores, and hyphens */
+
+	for (size_t i = 0; i < strlen(id); i++) {
+		if ((isalnum((int)id[i]) && islower((int)id[i])) || id[i] == '.' || id[i] == '_' || id[i] == '-') {
+			continue;
+		}
+
+		return 0;
+	}
+
+	return 1;
+}

src/common/include/ocre/common.h

@@ -0,0 +1,24 @@
+/**
+ * @copyright Copyright (c) contributors to Project Ocre,
+ * which has been established as Project Ocre a Series of LF Projects, LLC
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef OCRE_COMMON_H
+#define OCRE_COMMON_H
+
+/**
+ * @brief Check if a container or image ID is valid
+ * @memberof ocre_context
+ *
+ * Checks if a container or image ID is valid. A valid container or image ID must not be NULL, empty, or start with a
+ * dot '.'. It can only contain alphanumeric characters, dots, underscores, and hyphens.
+ *
+ * @param id A pointer to the container or image ID to check
+ *
+ * @return Zero if invalid, 1 if valid
+ */
+int ocre_is_valid_id(const char *id);
+
+#endif /* OCRE_COMMON_H */

src/ocre/include/ocre/library.h

@@ -87,17 +87,4 @@ int ocre_destroy_context(struct ocre_context *context);
  */
 void ocre_deinitialize(void);
 
-/**
- * @brief Check if a container or image ID is valid
- * @memberof ocre_context
- *
- * Checks if a container or image ID is valid. A valid container or image ID must not be NULL, empty, or start with a
- * dot '.'. It can only contain alphanumeric characters, dots, underscores, and hyphens.
- *
- * @param id A pointer to the container or image ID to check
- *
- * @return Zero if invalid, 1 if valid
- */
-int ocre_is_valid_id(const char *id);
-
 #endif /* OCRE_LIBRARY_H */

src/ocre/include/ocre/ocre.h

@@ -51,6 +51,7 @@
  * See ocre_runtime_vtable class for documentation.
  */
 
+#include <ocre/common.h>
 #include <ocre/library.h>
 #include <ocre/context.h>
 #include <ocre/container.h>

src/ocre/ocre.c

@@ -9,7 +9,6 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <strings.h>
-#include <ctype.h>
 #include <dirent.h>
 #include <pthread.h>
 #include <sys/stat.h>
@@ -452,30 +451,3 @@ void ocre_deinitialize(void)
 		free(r_elt);
 	}
 }
-
-int ocre_is_valid_id(const char *id)
-{
-	/* Cannot be NULL */
-
-	if (!id) {
-		return 0;
-	}
-
-	/* Cannot be empty or start with a dot '.' */
-
-	if (id[0] == '\0' || id[0] == '.') {
-		return 0;
-	}
-
-	/* Can only contain alphanumeric characters, dots, underscores, and hyphens */
-
-	for (size_t i = 0; i < strlen(id); i++) {
-		if ((isalnum(id[i]) && islower(id[i])) || id[i] == '.' || id[i] == '_' || id[i] == '-') {
-			continue;
-		}
-
-		return 0;
-	}
-
-	return 1;
-}

zephyr/CMakeLists.txt

@@ -32,3 +32,5 @@ endif()
 if(CONFIG_OCRE_STORAGE_PARTITION)
     include(storage_partition.cmake)
 endif()
+
+target_link_libraries(OcreCommon PUBLIC zephyr_interface)