[Openvas-commits] r11490 - in trunk/gsa: . src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Aug 23 17:21:56 CEST 2011
Author: mattm
Date: 2011-08-23 17:21:53 +0200 (Tue, 23 Aug 2011)
New Revision: 11490
Modified:
trunk/gsa/ChangeLog
trunk/gsa/src/gsad.c
trunk/gsa/src/gsad_omp.c
trunk/gsa/src/gsad_omp.h
Log:
Convert more pages to new param mechanism.
* src/gsad.c (exec_omp_get): Pass single param instead of many.
* src/gsad_omp.c (delete_trash_task_omp, delete_trash_escalator_omp)
(delete_trash_lsc_credential_omp, delete_trash_agent_omp)
(delete_trash_schedule_omp, delete_trash_target_omp)
(delete_trash_config_omp, delete_trash_slave_omp)
(delete_trash_report_format_omp): Replace multiple args with one.
* src/gsad_omp.h: Update headers accordingly.
Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog 2011-08-23 14:56:06 UTC (rev 11489)
+++ trunk/gsa/ChangeLog 2011-08-23 15:21:53 UTC (rev 11490)
@@ -4,11 +4,25 @@
* src/gsad.c (exec_omp_get): Pass single param instead of many.
+ * src/gsad_omp.c (delete_trash_task_omp, delete_trash_escalator_omp)
+ (delete_trash_lsc_credential_omp, delete_trash_agent_omp)
+ (delete_trash_schedule_omp, delete_trash_target_omp)
+ (delete_trash_config_omp, delete_trash_slave_omp)
+ (delete_trash_report_format_omp): Replace multiple args with one.
+
+ * src/gsad_omp.h: Update headers accordingly.
+
+2011-08-23 Matthew Mundell <matthew.mundell at greenbone.net>
+
+ Convert more pages to new param mechanism.
+
+ * src/gsad.c (exec_omp_get): Pass single param instead of many.
+
* src/gsad_oap.c (delete_user_oap): Replace multiple args with one.
- * src/gsad_omp.c (delete_escalator_omp delete_lsc_credential_omp)
- (delete_agent_omp delete_schedule_omp delete_target_omp delete_config_omp)
- (delete_slave_omp delete_report_format_omp): Replace multiple args with
+ * src/gsad_omp.c (delete_escalator_omp, delete_lsc_credential_omp)
+ (delete_agent_omp, delete_schedule_omp, delete_target_omp, delete_config_omp)
+ (delete_slave_omp, delete_report_format_omp): Replace multiple args with
one.
* src/gsad_omp.h, src/gsad_oap.h: Update headers accordingly.
Modified: trunk/gsa/src/gsad.c
===================================================================
--- trunk/gsa/src/gsad.c 2011-08-23 14:56:06 UTC (rev 11489)
+++ trunk/gsa/src/gsad.c 2011-08-23 15:21:53 UTC (rev 11490)
@@ -3526,83 +3526,15 @@
ELSE (delete_slave)
ELSE_OAP (delete_user)
ELSE (delete_target)
-
- else if ((!strcmp (con_info->req_parms.cmd, "delete_trash_agent"))
- && (con_info->req_parms.agent_id != NULL))
- {
- validate (validator, "agent_id", &con_info->req_parms.agent_id);
- con_info->response =
- delete_trash_agent_omp (credentials, con_info->req_parms.agent_id);
- }
-
- else if ((!strcmp (con_info->req_parms.cmd, "delete_trash_config"))
- && (con_info->req_parms.config_id != NULL))
- {
- validate (validator, "config_id", &con_info->req_parms.config_id);
- con_info->response =
- delete_trash_config_omp (credentials, con_info->req_parms.config_id);
- }
-
- else if ((!strcmp (con_info->req_parms.cmd, "delete_trash_escalator"))
- && (con_info->req_parms.escalator_id != NULL))
- {
- validate (validator, "escalator_id", &con_info->req_parms.escalator_id);
- con_info->response =
- delete_trash_escalator_omp (credentials, con_info->req_parms.escalator_id);
- }
-
- else if ((!strcmp (con_info->req_parms.cmd, "delete_trash_lsc_credential"))
- && (con_info->req_parms.lsc_credential_id != NULL))
- {
- validate (validator, "lsc_credential_id",
- &con_info->req_parms.lsc_credential_id);
- con_info->response =
- delete_trash_lsc_credential_omp (credentials,
- con_info->req_parms.lsc_credential_id);
- }
-
- else if ((!strcmp (con_info->req_parms.cmd, "delete_trash_report_format"))
- && (con_info->req_parms.report_format_id != NULL))
- {
- validate (validator, "report_format_id",
- &con_info->req_parms.report_format_id);
- con_info->response =
- delete_trash_report_format_omp (credentials,
- con_info->req_parms.report_format_id);
- }
-
- else if ((!strcmp (con_info->req_parms.cmd, "delete_trash_schedule"))
- && (con_info->req_parms.schedule_id != NULL))
- {
- validate (validator, "schedule_id", &con_info->req_parms.schedule_id);
- con_info->response =
- delete_trash_schedule_omp (credentials, con_info->req_parms.schedule_id);
- }
-
- else if ((!strcmp (con_info->req_parms.cmd, "delete_trash_slave"))
- && (con_info->req_parms.slave_id != NULL))
- {
- validate (validator, "slave_id", &con_info->req_parms.slave_id);
- con_info->response =
- delete_trash_slave_omp (credentials, con_info->req_parms.slave_id);
- }
-
- else if ((!strcmp (con_info->req_parms.cmd, "delete_trash_target"))
- && (con_info->req_parms.target_id != NULL))
- {
- validate (validator, "target_id", &con_info->req_parms.target_id);
- con_info->response =
- delete_trash_target_omp (credentials, con_info->req_parms.target_id);
- }
-
- else if ((!strcmp (con_info->req_parms.cmd, "delete_trash_task"))
- && (con_info->req_parms.task_id != NULL))
- {
- validate (validator, "task_id", &con_info->req_parms.task_id);
- con_info->response =
- delete_trash_task_omp (credentials, con_info->req_parms.task_id);
- }
-
+ ELSE (delete_trash_agent)
+ ELSE (delete_trash_config)
+ ELSE (delete_trash_escalator)
+ ELSE (delete_trash_lsc_credential)
+ ELSE (delete_trash_report_format)
+ ELSE (delete_trash_schedule)
+ ELSE (delete_trash_slave)
+ ELSE (delete_trash_target)
+ ELSE (delete_trash_task)
ELSE (delete_config)
ELSE (empty_trashcan)
else if (!strcmp (con_info->req_parms.cmd, "escalate_report"))
Modified: trunk/gsa/src/gsad_omp.c
===================================================================
--- trunk/gsa/src/gsad_omp.c 2011-08-23 14:56:06 UTC (rev 11489)
+++ trunk/gsa/src/gsad_omp.c 2011-08-23 15:21:53 UTC (rev 11490)
@@ -4085,19 +4085,22 @@
* @brief Delete a trash agent, get all agents, XSL transform the result.
*
* @param[in] credentials Username and password for authentication.
- * @param[in] agent_id UUID of agent.
+ * @param[in] params Request parameters.
*
* @return Result of XSL transformation.
*/
char *
-delete_trash_agent_omp (credentials_t * credentials, const char *agent_id)
+delete_trash_agent_omp (credentials_t * credentials, params_t *params)
{
GString *xml;
gchar *ret;
gnutls_session_t session;
int socket;
gchar *html;
+ const char *agent_id;
+ agent_id = params_value (params, "agent_id");
+
if (agent_id == NULL)
return gsad_message (credentials,
"Internal error", __FUNCTION__, __LINE__,
@@ -4168,19 +4171,22 @@
* @brief Delete a trash config, get all trash, XSL transform the result.
*
* @param[in] credentials Username and password for authentication.
- * @param[in] config_id UUID of config.
+ * @param[in] params Request parameters.
*
* @return Result of XSL transformation.
*/
char *
-delete_trash_config_omp (credentials_t * credentials, const char *config_id)
+delete_trash_config_omp (credentials_t * credentials, params_t *params)
{
GString *xml;
gchar *ret;
gnutls_session_t session;
int socket;
gchar *html;
+ const char *config_id;
+ config_id = params_value (params, "config_id");
+
if (config_id == NULL)
return gsad_message (credentials,
"Internal error", __FUNCTION__, __LINE__,
@@ -4251,19 +4257,22 @@
* @brief Delete a trash escalator, get all trash, XSL transform the result.
*
* @param[in] credentials Username and password for authentication.
- * @param[in] escalator_id UUID of escalator.
+ * @param[in] params Request parameters.
*
* @return Result of XSL transformation.
*/
char *
-delete_trash_escalator_omp (credentials_t * credentials, const char *escalator_id)
+delete_trash_escalator_omp (credentials_t * credentials, params_t *params)
{
GString *xml;
gchar *ret;
gnutls_session_t session;
int socket;
gchar *html;
+ const char *escalator_id;
+ escalator_id = params_value (params, "escalator_id");
+
if (escalator_id == NULL)
return gsad_message (credentials,
"Internal error", __FUNCTION__, __LINE__,
@@ -4333,21 +4342,23 @@
/**
* @brief Delete a trash LSC credential, get all trash, XSL transform the result.
*
- * @param[in] credentials Username and password for authentication.
- * @param[in] lsc_credential_id UUID of LSC credential.
+ * @param[in] credentials Username and password for authentication.
+ * @param[in] params Request parameters.
*
* @return Result of XSL transformation.
*/
char *
-delete_trash_lsc_credential_omp (credentials_t * credentials,
- const char *lsc_credential_id)
+delete_trash_lsc_credential_omp (credentials_t * credentials, params_t *params)
{
GString *xml;
gchar *ret;
gnutls_session_t session;
int socket;
gchar *html;
+ const char *lsc_credential_id;
+ lsc_credential_id = params_value (params, "lsc_credential_id");
+
if (lsc_credential_id == NULL)
return gsad_message (credentials,
"Internal error", __FUNCTION__, __LINE__,
@@ -4418,19 +4429,22 @@
* @brief Delete a trash report format, get all trash, XSL transform the result.
*
* @param[in] credentials Username and password for authentication.
- * @param[in] report_format_id UUID of report format.
+ * @param[in] params Request parameters.
*
* @return Result of XSL transformation.
*/
char *
-delete_trash_report_format_omp (credentials_t * credentials, const char *report_format_id)
+delete_trash_report_format_omp (credentials_t * credentials, params_t *params)
{
GString *xml;
gchar *ret;
gnutls_session_t session;
int socket;
gchar *html;
+ const char *report_format_id;
+ report_format_id = params_value (params, "report_format_id");
+
if (report_format_id == NULL)
return gsad_message (credentials,
"Internal error", __FUNCTION__, __LINE__,
@@ -4501,19 +4515,22 @@
* @brief Delete a trash schedule, get all trash, XSL transform the result.
*
* @param[in] credentials Username and password for authentication.
- * @param[in] schedule_id UUID of schedule.
+ * @param[in] params Request parameters.
*
* @return Result of XSL transformation.
*/
char *
-delete_trash_schedule_omp (credentials_t * credentials, const char *schedule_id)
+delete_trash_schedule_omp (credentials_t * credentials, params_t *params)
{
GString *xml;
gchar *ret;
gnutls_session_t session;
int socket;
gchar *html;
+ const char *schedule_id;
+ schedule_id = params_value (params, "schedule_id");
+
if (schedule_id == NULL)
return gsad_message (credentials,
"Internal error", __FUNCTION__, __LINE__,
@@ -4584,19 +4601,22 @@
* @brief Delete a trash slave, get all trash, XSL transform the result.
*
* @param[in] credentials Username and password for authentication.
- * @param[in] slave_id UUID of slave.
+ * @param[in] params Request parameters.
*
* @return Result of XSL transformation.
*/
char *
-delete_trash_slave_omp (credentials_t * credentials, const char *slave_id)
+delete_trash_slave_omp (credentials_t * credentials, params_t *params)
{
GString *xml;
gchar *ret;
gnutls_session_t session;
int socket;
gchar *html;
+ const char *slave_id;
+ slave_id = params_value (params, "slave_id");
+
if (slave_id == NULL)
return gsad_message (credentials,
"Internal error", __FUNCTION__, __LINE__,
@@ -4667,19 +4687,22 @@
* @brief Delete a trash target, get all trash, XSL transform the result.
*
* @param[in] credentials Username and password for authentication.
- * @param[in] target_id UUID of target.
+ * @param[in] params Request parameters.
*
* @return Result of XSL transformation.
*/
char *
-delete_trash_target_omp (credentials_t * credentials, const char *target_id)
+delete_trash_target_omp (credentials_t * credentials, params_t *params)
{
GString *xml;
gchar *ret;
gnutls_session_t session;
int socket;
gchar *html;
+ const char *target_id;
+ target_id = params_value (params, "target_id");
+
if (target_id == NULL)
return gsad_message (credentials,
"Internal error", __FUNCTION__, __LINE__,
@@ -4750,19 +4773,22 @@
* @brief Delete a trash task, get all trash, XSL transform the result.
*
* @param[in] credentials Username and password for authentication.
- * @param[in] task_id UUID of task.
+ * @param[in] params Request parameters.
*
* @return Result of XSL transformation.
*/
char *
-delete_trash_task_omp (credentials_t * credentials, const char *task_id)
+delete_trash_task_omp (credentials_t * credentials, params_t *params)
{
GString *xml;
gchar *ret;
gnutls_session_t session;
int socket;
gchar *html;
+ const char *task_id;
+ task_id = params_value (params, "task_id");
+
if (task_id == NULL)
return gsad_message (credentials,
"Internal error", __FUNCTION__, __LINE__,
Modified: trunk/gsa/src/gsad_omp.h
===================================================================
--- trunk/gsa/src/gsad_omp.h 2011-08-23 14:56:06 UTC (rev 11489)
+++ trunk/gsa/src/gsad_omp.h 2011-08-23 15:21:53 UTC (rev 11490)
@@ -45,7 +45,7 @@
const char *, const char *, const char *, const char *,
const char *, const char *);
char * delete_task_omp (credentials_t *, const char *, int, const char *);
-char * delete_trash_task_omp (credentials_t *, const char *);
+char * delete_trash_task_omp (credentials_t *, params_t *);
char * edit_task_omp (credentials_t *, const char *, const char *, const char *,
const char *, const char *, int);
char * new_task_omp (credentials_t *, const char *, int);
@@ -88,7 +88,7 @@
GArray *, const char *, GArray *, const char *,
GArray *);
char * delete_escalator_omp (credentials_t *, params_t *);
-char * delete_trash_escalator_omp (credentials_t *, const char *);
+char * delete_trash_escalator_omp (credentials_t *, params_t *);
char * test_escalator_omp (credentials_t *, const char *, const char *,
const char *);
char * get_escalator_omp (credentials_t *, const char *, const char *,
@@ -103,7 +103,7 @@
const char *, const char *, const char *,
const char *, const char *, const char *);
char * delete_lsc_credential_omp (credentials_t *, params_t *);
-char * delete_trash_lsc_credential_omp (credentials_t *, const char *);
+char * delete_trash_lsc_credential_omp (credentials_t *, params_t *);
char * edit_lsc_credential_omp (credentials_t *, params_t *);
char * save_lsc_credential_omp (credentials_t *, params_t *);
@@ -111,7 +111,7 @@
gsize *, const char *, const char *, char **, char **);
char * create_agent_omp (credentials_t *, params_t *);
char * delete_agent_omp (credentials_t *, params_t *);
-char * delete_trash_agent_omp (credentials_t *, const char *);
+char * delete_trash_agent_omp (credentials_t *, params_t *);
char * verify_agent_omp (credentials_t *, const char *);
char * create_schedule_omp (credentials_t *, const char *, const char *,
@@ -120,7 +120,7 @@
const char *, const char *, const char *);
char * delete_schedule_omp (credentials_t *, params_t *);
-char * delete_trash_schedule_omp (credentials_t *, const char *);
+char * delete_trash_schedule_omp (credentials_t *, params_t *);
char * get_schedule_omp (credentials_t *, const char *, const char *,
const char *);
char * get_schedules_omp (credentials_t *, const char *, const char *);
@@ -132,7 +132,7 @@
const char *, const char *, const char*, const char*,
const char *, const char*);
char * delete_target_omp (credentials_t *, params_t *);
-char * delete_trash_target_omp (credentials_t *, const char *);
+char * delete_trash_target_omp (credentials_t *, params_t *);
char * get_config_omp (credentials_t *, const char *, int);
char * get_configs_omp (credentials_t *, const char *, const char *);
@@ -152,7 +152,7 @@
char * create_config_omp (credentials_t *, char *, char *, const char *);
char * import_config_omp (credentials_t *, params_t *);
char * delete_config_omp (credentials_t *, params_t *);
-char * delete_trash_config_omp (credentials_t *, const char *);
+char * delete_trash_config_omp (credentials_t *, params_t *);
char * export_config_omp (credentials_t *, const char *, enum content_type*,
char **, gsize *);
@@ -230,7 +230,7 @@
char * create_slave_omp (credentials_t *, const char *, const char *,
const char *, const char*, const char*, const char*);
char * delete_slave_omp (credentials_t *, params_t *);
-char * delete_trash_slave_omp (credentials_t *, const char *);
+char * delete_trash_slave_omp (credentials_t *, params_t *);
char * get_system_reports_omp (credentials_t *, const char *, const char *);
char * get_system_report_omp (credentials_t *, const char *, const char *,
@@ -241,7 +241,7 @@
const char *);
char * get_report_formats_omp (credentials_t *, const char *, const char *);
char * delete_report_format_omp (credentials_t *, params_t *);
-char * delete_trash_report_format_omp (credentials_t *, const char *);
+char * delete_trash_report_format_omp (credentials_t *, params_t *);
char * edit_report_format_omp (credentials_t *, const char *, const char *,
const char *, const char *);
char * import_report_format_omp (credentials_t *, char *);
More information about the Openvas-commits
mailing list