Change: move rest of resources section to dedicated files

src/gmp.c

@@ -103,6 +103,7 @@
 #include "manage_port_lists.h"
 #include "manage_report_configs.h"
 #include "manage_report_formats.h"
+#include "manage_resources.h"
 #include "manage_roles.h"
 #include "manage_runtime_flags.h"
 #include "manage_tls_certificates.h"

src/manage.h

@@ -386,9 +386,6 @@ get_scanner_type_by_uuid (const char *);
 
 /* Resources. */
 
-int
-resource_count (const char *, const get_data_t *);
-
 int
 resource_id_exists (const char *, const char *);
 
@@ -398,12 +395,6 @@ trash_id_exists (const char *, const char *);
 int
 delete_resource (const char *, const char *, int);
 
-int
-resource_id_deprecated (const char *, const char *);
-
-void
-set_resource_id_deprecated (const char *, const char *, gboolean);
-
 
 /* Events and Alerts. */
 

src/manage_agent_common.h

@@ -17,7 +17,7 @@
 
 #include "iterator.h"
 #include "manage_get.h"
-#include "manage_resources.h"
+#include "manage_resources_types.h"
 #include "manage_utils.h"
 
 #include <agent_controller/agent_controller.h>

src/manage_agent_groups.h

@@ -20,7 +20,7 @@
 #include "iterator.h"
 #include "manage_agent_common.h"
 #include "manage_get.h"
-#include "manage_resources.h"
+#include "manage_resources_types.h"
 
 /**
  * @brief Represents an agent group and its metadata.

src/manage_agent_installers.h

@@ -15,7 +15,7 @@
 #ifndef _GVMD_MANAGE_AGENT_INSTALLERS_H
 #define _GVMD_MANAGE_AGENT_INSTALLERS_H
 
-#include "manage_resources.h"
+#include "manage_resources_types.h"
 #include "iterator.h"
 #include "gmp_get.h"
 #include <gvm/util/streamvalidator.h>

src/manage_alerts.h

@@ -6,7 +6,7 @@
 #ifndef _GVMD_MANAGE_ALERTS_H
 #define _GVMD_MANAGE_ALERTS_H
 
-#include "manage_resources.h"
+#include "manage_resources_types.h"
 #include "manage_events.h"
 #include "manage_get.h"
 #include "manage_tasks.h"

src/manage_configs.h

@@ -6,7 +6,7 @@
 #ifndef _GVMD_MANAGE_CONFIGS_H
 #define _GVMD_MANAGE_CONFIGS_H
 
-#include "manage_resources.h"
+#include "manage_resources_types.h"
 #include "manage_get.h"
 #include "manage_preferences.h"
 

src/manage_container_image_scanner.h

@@ -15,7 +15,7 @@
 #ifndef _GVMD_MANAGE_CONTAINER_IMAGE_SCANNER_H
 #define _GVMD_MANAGE_CONTAINER_IMAGE_SCANNER_H
 
-#include "manage_resources.h"
+#include "manage_resources_types.h"
 #include <gvm/http_scanner/http_scanner.h>
 
 http_scanner_connector_t

src/manage_credential_stores.h

@@ -14,7 +14,7 @@
 #define _GVMD_MANAGE_CREDENTIAL_STORES_H
 
 #include "manage_get.h"
-#include "manage_resources.h"
+#include "manage_resources_types.h"
 #include <gnutls/gnutls.h>
 
 /**

src/manage_filter_utils.h

@@ -13,7 +13,7 @@
 #ifndef _GVMD_MANAGE_FILTER_UTILS_H
 #define _GVMD_MANAGE_FILTER_UTILS_H
 
-#include "manage_resources.h"
+#include "manage_resources_types.h"
 #include <gvm/base/array.h>
 
 /**

src/manage_filters.h

@@ -7,7 +7,7 @@
 #define _GVMD_MANAGE_FILTERS_H
 
 #include "gmp_get.h"
-#include "manage_resources.h"
+#include "manage_resources_types.h"
 
 /**
  * @brief filt_id value to use term or built-in default filter.

src/manage_get.h

@@ -12,7 +12,7 @@
 #define _GVMD_MANAGE_GET_H
 
 #include "iterator.h"
-#include "manage_resources.h"
+#include "manage_resources_types.h"
 #include "manage_filter_utils.h"
 
 #include <glib.h>

src/manage_groups.h

@@ -7,7 +7,7 @@
 #define _GVMD_MANAGE_GROUPS_H
 
 #include "manage_get.h"
-#include "manage_resources.h"
+#include "manage_resources_types.h"
 
 char*
 group_uuid (group_t);

src/manage_http_scanner.h

@@ -15,7 +15,7 @@
 #ifndef _GVMD_MANAGE_HTTP_SCANNER_H
 #define _GVMD_MANAGE_HTTP_SCANNER_H
 
-#include "manage_resources.h"
+#include "manage_resources_types.h"
 
 #include <gvm/http_scanner/http_scanner.h>
 

src/manage_openvas.h

@@ -15,7 +15,7 @@
 
 #include <gvm/osp/osp.h>
 #include <glib.h>
-#include "manage_resources.h"
+#include "manage_resources_types.h"
 #if ENABLE_CREDENTIAL_STORES
 #include "manage_credential_store_cyberark.h"
 #endif

src/manage_osp.h

@@ -14,7 +14,7 @@
 #include <gvm/osp/osp.h>
 #include <glib.h>
 #include "manage_openvas.h"
-#include "manage_resources.h"
+#include "manage_resources_types.h"
 
 /**
  * @brief Connection data.

src/manage_permissions.h

@@ -6,7 +6,7 @@
 #ifndef _GVMD_MANAGE_PERMISSIONS_H
 #define _GVMD_MANAGE_PERMISSIONS_H
 
-#include "manage_resources.h"
+#include "manage_resources_types.h"
 #include "gmp_get.h"
 
 int

src/manage_port_lists.h

@@ -6,7 +6,7 @@
 #ifndef _GVMD_MANAGE_PORT_LISTS_H
 #define _GVMD_MANAGE_PORT_LISTS_H
 
-#include "manage_resources.h"
+#include "manage_resources_types.h"
 #include "gmp_get.h"
 
 #include <glib.h>

src/manage_report_configs.h

@@ -14,7 +14,7 @@
 #define _GVMD_MANAGE_REPORT_CONFIGS_H
 
 #include "manage_report_formats.h"
-#include "manage_resources.h"
+#include "manage_resources_types.h"
 
 #include <glib.h>
 

src/manage_report_formats.h

@@ -6,7 +6,7 @@
 #ifndef _GVMD_MANAGE_REPORT_FORMATS_H
 #define _GVMD_MANAGE_REPORT_FORMATS_H
 
-#include "manage_resources.h"
+#include "manage_resources_types.h"
 #include "gmp_get.h"
 
 #include <glib.h>

src/manage_resources.h

@@ -13,47 +13,9 @@
 #ifndef _GVMD_MANAGE_RESOURCES_H
 #define _GVMD_MANAGE_RESOURCES_H
 
+#include "manage_resources_types.h"
 #include "iterator.h"
-
-
-/* Resource types */
-#if ENABLE_AGENTS
-typedef resource_t agent_t;
-typedef resource_t agent_group_t;
-typedef resource_t agent_installer_t;
-#endif
-typedef resource_t alert_t;
-typedef resource_t asset_snapshot_t;
-typedef resource_t config_t;
-typedef resource_t credential_store_t;
-typedef resource_t credential_t;
-typedef resource_t filter_t;
-typedef resource_t group_t;
-typedef resource_t host_t;
-typedef resource_t note_t;
-typedef resource_t nvt_t;
-typedef resource_t oci_image_target_t;
-typedef resource_t override_t;
-typedef resource_t permission_t;
-typedef resource_t port_list_t;
-typedef resource_t port_range_t;
-typedef resource_t report_config_param_t;
-typedef resource_t report_config_t;
-typedef resource_t report_format_param_t;
-typedef resource_t report_format_t;
-typedef resource_t report_host_t;
-typedef resource_t report_t;
-typedef resource_t result_t;
-typedef resource_t role_t;
-typedef resource_t scanner_t;
-typedef resource_t schedule_t;
-typedef resource_t setting_t;
-typedef resource_t tag_t;
-typedef resource_t target_t;
-typedef resource_t task_t;
-typedef resource_t ticket_t;
-typedef resource_t tls_certificate_t;
-typedef resource_t user_t;
+#include "manage_get.h"
 
 
 /* Resource type information. */
@@ -115,10 +77,19 @@ secinfo_type_is_scap (const char*);
 
 /* Everything else. */
 
+int
+resource_count (const char *, const get_data_t *);
+
 int
 manage_resource_name (const char *, const char *, char **);
 
 int
 manage_trash_resource_name (const char *, const char *, char **);
 
+int
+resource_id_deprecated (const char *, const char *);
+
+void
+set_resource_id_deprecated (const char *, const char *, gboolean);
+
 #endif /* not _GVMD_MANAGE_RESOURCES_H */

src/manage_resources_types.h

@@ -0,0 +1,56 @@
+/* Copyright (C) 2025 Greenbone AG
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+/**
+ * @file
+ * @brief GVM management layer: Generic resource type handling headers.
+ *
+ * Non-SQL generic resource type handling headers for the GVM management layer.
+ */
+
+#ifndef _GVMD_MANAGE_RESOURCES_TYPES_H
+#define _GVMD_MANAGE_RESOURCES_TYPES_H
+
+#include  "iterator.h"
+
+#if ENABLE_AGENTS
+typedef resource_t agent_t;
+typedef resource_t agent_group_t;
+typedef resource_t agent_installer_t;
+#endif
+typedef resource_t alert_t;
+typedef resource_t asset_snapshot_t;
+typedef resource_t config_t;
+typedef resource_t credential_store_t;
+typedef resource_t credential_t;
+typedef resource_t filter_t;
+typedef resource_t group_t;
+typedef resource_t host_t;
+typedef resource_t note_t;
+typedef resource_t nvt_t;
+typedef resource_t oci_image_target_t;
+typedef resource_t override_t;
+typedef resource_t permission_t;
+typedef resource_t port_list_t;
+typedef resource_t port_range_t;
+typedef resource_t report_config_param_t;
+typedef resource_t report_config_t;
+typedef resource_t report_format_param_t;
+typedef resource_t report_format_t;
+typedef resource_t report_host_t;
+typedef resource_t report_t;
+typedef resource_t result_t;
+typedef resource_t role_t;
+typedef resource_t scanner_t;
+typedef resource_t schedule_t;
+typedef resource_t setting_t;
+typedef resource_t tag_t;
+typedef resource_t target_t;
+typedef resource_t task_t;
+typedef resource_t ticket_t;
+typedef resource_t tls_certificate_t;
+typedef resource_t user_t;
+
+#endif /* not _GVMD_MANAGE_RESOURCES_TYPES_H */

src/manage_roles.h

@@ -7,7 +7,7 @@
 #define _GVMD_MANAGE_ROLES_H
 
 #include "manage_get.h"
-#include "manage_resources.h"
+#include "manage_resources_types.h"
 #include "sql.h" // Sadly, for db_conn_info_t
 
 int

src/manage_scan_queue.h

@@ -12,7 +12,7 @@
 #define _GVMD_MANAGE_SCAN_QUEUE_H
 
 #include <glib.h>
-#include "manage_resources.h"
+#include "manage_resources_types.h"
 
 /**
  * @brief Default maximum number of active scan handlers