Skip to content

Commit 5798ee2

Browse files
ozgengreenbonebot
authored andcommitted
change: rename variables for clarity
1 parent 97e8a51 commit 5798ee2

1 file changed

Lines changed: 36 additions & 34 deletions

File tree

agent_controller/agent_controller.c

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ agent_controller_agent_update_free (agent_controller_agent_update_t update)
939939
}
940940

941941
/**
942-
* @brief Allocate/zero a new scan agent config.
942+
* @brief Allocate/zero a new agent config.
943943
*/
944944
agent_controller_agent_config_t
945945
agent_controller_agent_config_new (void)
@@ -948,7 +948,7 @@ agent_controller_agent_config_new (void)
948948
}
949949

950950
/**
951-
* @brief Free a scan agent config.
951+
* @brief Free an agent config.
952952
*
953953
* @param[in] cfg to be freed
954954
*/
@@ -968,73 +968,75 @@ agent_controller_agent_config_free (agent_controller_agent_config_t cfg)
968968
}
969969

970970
/**
971-
* @brief Allocates and initializes a new scan agent defaults structure.
971+
* @brief Allocates and initializes a new scan agent config structure.
972972
*
973-
* @return Newly allocated scan agent defaults structure on success, NULL on
973+
* @return Newly allocated scan agent config structure on success, NULL on
974974
* failure
975975
*/
976976
agent_controller_scan_agent_config_t
977977
agent_controller_scan_agent_config_new ()
978978
{
979-
agent_controller_scan_agent_config_t d =
979+
agent_controller_scan_agent_config_t scan_agent_cfg =
980980
g_malloc0 (sizeof (struct agent_controller_scan_agent_config));
981-
if (!d)
981+
if (!scan_agent_cfg)
982982
return NULL;
983983

984-
d->agent_defaults = agent_controller_agent_config_new ();
985-
if (!d->agent_defaults)
984+
scan_agent_cfg->agent_defaults = agent_controller_agent_config_new ();
985+
if (!scan_agent_cfg->agent_defaults)
986986
{
987-
g_free (d);
987+
g_free (scan_agent_cfg);
988988
return NULL;
989989
}
990990

991-
d->agent_control_defaults = g_malloc0 (sizeof (*d->agent_control_defaults));
991+
scan_agent_cfg->agent_control_defaults =
992+
g_malloc0 (sizeof (*scan_agent_cfg->agent_control_defaults));
992993

993-
d->agent_control_defaults->update_to_latest = -1;
994-
return d;
994+
scan_agent_cfg->agent_control_defaults->update_to_latest = -1;
995+
return scan_agent_cfg;
995996
}
996997

997998
/**
998-
* @brief Frees a scan agent defaults structure.
999+
* @brief Frees a scan agent config structure.
9991000
*
1000-
* @param[in] d Scan agent defaults structure to free (may be NULL)
1001+
* @param[in] scan_agent_cfg Scan agent config structure to free (may be NULL)
10011002
*/
10021003
void
1003-
agent_controller_scan_agent_config_free (agent_controller_scan_agent_config_t d)
1004+
agent_controller_scan_agent_config_free (
1005+
agent_controller_scan_agent_config_t scan_agent_cfg)
10041006
{
1005-
if (!d)
1007+
if (!scan_agent_cfg)
10061008
return;
10071009

1008-
agent_controller_agent_config_free (d->agent_defaults);
1009-
d->agent_defaults = NULL;
1010+
agent_controller_agent_config_free (scan_agent_cfg->agent_defaults);
1011+
scan_agent_cfg->agent_defaults = NULL;
10101012

1011-
g_free (d->agent_control_defaults);
1012-
d->agent_control_defaults = NULL;
1013+
g_free (scan_agent_cfg->agent_control_defaults);
1014+
scan_agent_cfg->agent_control_defaults = NULL;
10131015

1014-
g_free (d);
1016+
g_free (scan_agent_cfg);
10151017
}
10161018

10171019
/**
1018-
* @brief Converts scan agent default configuration into a JSON string.
1020+
* @brief Converts scan agent configuration into a JSON string.
10191021
*
1020-
* @param[in] d Scan agent defaults structure to serialize
1022+
* @param[in] scan_agent_cfg Scan agent config structure to serialize
10211023
*
10221024
* @return Newly allocated JSON string on success, NULL on failure
10231025
*/
10241026
gchar *
10251027
agent_controller_convert_scan_agent_config_string (
1026-
agent_controller_scan_agent_config_t d)
1028+
agent_controller_scan_agent_config_t scan_agent_cfg)
10271029
{
1028-
if (!d || !d->agent_defaults)
1030+
if (!scan_agent_cfg || !scan_agent_cfg->agent_defaults)
10291031
return NULL;
10301032

10311033
cJSON *root = cJSON_CreateObject ();
10321034
if (!root)
10331035
return NULL;
10341036

10351037
/* agent_defaults */
1036-
cJSON *agent_defaults =
1037-
agent_controller_agent_config_struct_to_cjson (d->agent_defaults);
1038+
cJSON *agent_defaults = agent_controller_agent_config_struct_to_cjson (
1039+
scan_agent_cfg->agent_defaults);
10381040
if (!agent_defaults)
10391041
agent_defaults = cJSON_CreateObject ();
10401042

@@ -1048,9 +1050,10 @@ agent_controller_convert_scan_agent_config_string (
10481050
return NULL;
10491051
}
10501052

1051-
if (d->agent_control_defaults->update_to_latest != -1)
1052-
cJSON_AddBoolToObject (acd, "update_to_latest",
1053-
d->agent_control_defaults->update_to_latest ? 1 : 0);
1053+
if (scan_agent_cfg->agent_control_defaults->update_to_latest != -1)
1054+
cJSON_AddBoolToObject (
1055+
acd, "update_to_latest",
1056+
scan_agent_cfg->agent_control_defaults->update_to_latest ? 1 : 0);
10541057

10551058
cJSON_AddItemToObject (root, "agent_control_defaults", acd);
10561059

@@ -1060,7 +1063,7 @@ agent_controller_convert_scan_agent_config_string (
10601063
}
10611064

10621065
/**
1063-
* @brief Parses scan agent default configuration from a JSON string.
1066+
* @brief Parses scan agent configuration from a JSON string.
10641067
*
10651068
* @param[in] config JSON string containing scan agent default configuration
10661069
*
@@ -1079,11 +1082,11 @@ agent_controller_parse_scan_agent_config_string (const gchar *config)
10791082
return NULL;
10801083
}
10811084

1082-
agent_controller_scan_agent_config_t d =
1085+
agent_controller_scan_agent_config_t scan_agent_cfg =
10831086
agent_controller_parse_scan_agent_config (root);
10841087

10851088
cJSON_Delete (root);
1086-
return d;
1089+
return scan_agent_cfg;
10871090
}
10881091

10891092
/**
@@ -1366,7 +1369,6 @@ agent_controller_convert_agent_config_string (
13661369
cfg->heartbeat.miss_until_inactive);
13671370
cJSON_AddItemToObject (root, "heartbeat", hb);
13681371

1369-
/* If nothing set, root returns empty → "{}" */
13701372
gchar *payload = cJSON_PrintUnformatted (root);
13711373
cJSON_Delete (root);
13721374
return payload;

0 commit comments

Comments
 (0)