File project4.diff of Package openais
--- openais-enter-macro.patch.orig
+++ openais-enter-macro.patch
@@ -0,0 +1,1230 @@
+diff --git a/services/amf.c b/services/amf.c
+index f05945c..af603b7 100644
+--- a/services/amf.c
++++ b/services/amf.c
+@@ -594,7 +594,7 @@ static void nodeids_init (void)
+ int i;
+ amf_node_t *amf_node;
+
+- ENTER ("");
++ ENTER();
+
+ if (amf_cluster == NULL) {
+ return;
+@@ -1111,7 +1111,7 @@ static void cluster_joined_nodes_start (void)
+ int i;
+ struct amf_node *node;
+
+- ENTER ("");
++ ENTER();
+ log_printf(LOG_NOTICE, "AMF synchronisation ready, starting cluster");
+
+ for (i = 0; i < clm_node_list_entries; i++) {
+@@ -1338,9 +1338,7 @@ static void amf_confchg_fn (
+ unsigned int *joined_list, int joined_list_entries,
+ struct memb_ring_id *ring_id)
+ {
+- ENTER ("mnum: %d, jnum: %d, lnum: %d, sync state: %s, ring ID %llu rep %s\n",
+- member_list_entries, joined_list_entries, left_list_entries,
+- scsm_state_names[scsm.state], ring_id->seq, api->totem_ip_print (&ring_id->rep));
++ ENTER();
+
+ switch (scsm.state) {
+ case UNCONFIGURED:
+@@ -1571,7 +1569,7 @@ static void message_handler_req_exec_amf_clc_cleanup_completed (
+ }
+
+ comp = amf_comp_find (amf_cluster, &req_exec->compName);
+- ENTER ("%s",comp->name.value);
++ ENTER();
+
+ if (comp == NULL) {
+ log_printf (LOG_ERR, "Error: '%s' not found", req_exec->compName.value);
+@@ -1603,7 +1601,7 @@ static void message_handler_req_exec_amf_healthcheck_tmo (
+ return;
+ }
+
+- ENTER ("%s", comp->name.value);
++ ENTER();
+
+ healthcheck = amf_comp_find_healthcheck (comp, &req_exec->safHealthcheckKey);
+
+diff --git a/services/amfapp.c b/services/amfapp.c
+index 120ed8b..3cf914a 100644
+--- a/services/amfapp.c
++++ b/services/amfapp.c
+@@ -151,7 +151,7 @@ static void application_defer_event (
+ amf_node_t *node)
+ {
+ application_event_t app_event = {event_type, app, node};
+- ENTER("");
++ ENTER();
+ amf_fifo_put (event_type, &app->deferred_events,
+ sizeof (application_event_t), &app_event);
+ }
+@@ -189,7 +189,7 @@ static void timer_function_application_recall_deferred_events (void *data)
+ {
+ amf_application_t *app = (amf_application_t*)data;
+
+- ENTER ("");
++ ENTER();
+ application_recall_deferred_events (app);
+ }
+
+@@ -239,14 +239,14 @@ static void start_all_sg_for_cluster (amf_application_t *app)
+
+ static void timer_function_cluster_application_started (void* app)
+ {
+- ENTER("");
++ ENTER();
+ amf_application_t *application = (amf_application_t*)app;
+ amf_cluster_application_started (application->cluster, application);
+ }
+
+ static void timer_function_node_application_started (void* app)
+ {
+- ENTER("");
++ ENTER();
+ amf_application_t *application = (amf_application_t*)app;
+ amf_node_application_started (application->node_to_start, application);
+ }
+@@ -258,7 +258,7 @@ static void application_enter_starting_sgs (struct amf_application *app,
+ int su_to_instantiate = 0;
+ app->node_to_start = node;
+ app->acsm_state = APP_AC_STARTING_SGS;
+- ENTER ("%s",app->name.value);
++ ENTER();
+ for (sg = app->sg_head; sg != NULL; sg = sg->next) {
+ su_to_instantiate += amf_sg_start (sg, node);
+ }
+@@ -279,7 +279,7 @@ static void application_enter_assigning_workload (amf_application_t *app)
+ {
+ amf_sg_t *sg = 0;
+ int posible_to_assign_si = 0;
+- ENTER ("%s",app->name.value);
++ ENTER();
+ app->acsm_state = APP_AC_ASSIGNING_WORKLOAD;
+ for (sg = app->sg_head; sg != NULL; sg = sg->next) {
+ if (amf_sg_assign_si_req (sg, 0)) {
+@@ -294,7 +294,7 @@ static void application_enter_assigning_workload (amf_application_t *app)
+
+ static void application_enter_workload_assigned (amf_application_t *app)
+ {
+- ENTER ("%s", app->name.value);
++ ENTER();
+ if (all_sg_assigned (app)){
+ app->acsm_state = APP_AC_WORKLOAD_ASSIGNED;
+ if (app->node_to_start == NULL){
+@@ -319,7 +319,7 @@ static void application_enter_workload_assigned (amf_application_t *app)
+ void amf_application_start (
+ struct amf_application *app, struct amf_node *node)
+ {
+- ENTER ("'%s'", app->name.value);
++ ENTER();
+ assert (app != NULL);
+ switch (app->acsm_state) {
+ case APP_AC_UNINSTANTIATED:
+@@ -365,7 +365,7 @@ void amf_application_assign_workload (struct amf_application *app,
+
+ assert (app != NULL);
+ app->node_to_start = node;
+- ENTER("app->acsm_state = %d",app->acsm_state);
++ ENTER();
+
+ switch (app->acsm_state) {
+ case APP_AC_STARTING_SGS:
+@@ -411,7 +411,7 @@ void amf_application_assign_workload (struct amf_application *app,
+ void amf_application_sg_started (struct amf_application *app, struct amf_sg *sg,
+ struct amf_node *node)
+ {
+- ENTER ("'%s %s'", app->name.value, sg->name.value);
++ ENTER();
+
+ assert (app != NULL);
+
+@@ -437,7 +437,7 @@ void amf_application_sg_started (struct amf_application *app, struct amf_sg *sg,
+ void amf_application_sg_assigned (
+ struct amf_application *app, struct amf_sg *sg)
+ {
+- ENTER ("'%s'", app->name.value);
++ ENTER();
+ assert (app != NULL);
+
+ switch (app->acsm_state) {
+diff --git a/services/amfcluster.c b/services/amfcluster.c
+index dd3e465..19f4af5 100644
+--- a/services/amfcluster.c
++++ b/services/amfcluster.c
+@@ -195,7 +195,7 @@ static void timer_function_cluster_recall_deferred_events (void *data)
+ {
+ amf_cluster_t *cluster = (amf_cluster_t*)data;
+
+- ENTER ("");
++ ENTER();
+ cluster_recall_deferred_events (cluster);
+ }
+
+@@ -260,7 +260,7 @@ static int cluster_applications_are_starting_sgs(struct amf_cluster *cluster)
+ static void amf_cluster_assign_workload (struct amf_cluster *cluster)
+ {
+ struct amf_application *app;
+- ENTER ("");
++ ENTER();
+
+ for (app = cluster->application_head; app != NULL; app = app->next) {
+ amf_application_assign_workload (app, NULL);
+@@ -279,7 +279,7 @@ static void timer_function_cluster_assign_workload_tmo (void *cluster)
+ {
+ ((struct amf_cluster*)cluster)->timeout_handle = 0;
+
+- ENTER ("");
++ enter();
+
+ amf_msg_mcast (MESSAGE_REQ_EXEC_AMF_CLUSTER_START_TMO, &this_amf_node->name,
+ sizeof(SaNameT));
+@@ -308,7 +308,7 @@ static void start_cluster_startup_timer (struct amf_cluster *cluster)
+ static inline void cluster_enter_starting_applications (
+ struct amf_cluster *cluster)
+ {
+- ENTER ("");
++ ENTER();
+ start_cluster_startup_timer (cluster);
+ amf_cluster->acsm_state = CLUSTER_AC_STARTING_APPLICATIONS;
+ amf_cluster_start_applications (cluster);
+@@ -316,7 +316,7 @@ static inline void cluster_enter_starting_applications (
+
+ static void acsm_cluster_enter_started (amf_cluster_t *cluster)
+ {
+- ENTER ("");
++ ENTER();
+ amf_cluster->acsm_state = CLUSTER_AC_STARTED;
+ amf_call_function_asynchronous (
+ timer_function_cluster_recall_deferred_events, cluster);
+@@ -329,7 +329,7 @@ static void acsm_cluster_enter_started (amf_cluster_t *cluster)
+ void amf_cluster_start_tmo_event (int is_sync_masterm,
+ struct amf_cluster *cluster, SaNameT *sourceNodeName)
+ {
+- ENTER ("acsm_state = %d", amf_cluster->acsm_state);
++ ENTER();
+
+ stop_cluster_startup_timer (cluster);
+
+@@ -392,7 +392,7 @@ void amf_cluster_start_applications(struct amf_cluster *cluster)
+ */
+ void amf_cluster_sync_ready (struct amf_cluster *cluster, struct amf_node *node)
+ {
+- ENTER ("");
++ ENTER();
+ switch (amf_cluster->acsm_state) {
+ case CLUSTER_AC_UNINSTANTIATED:
+ if (amf_cluster->saAmfClusterAdminState ==
+@@ -448,8 +448,7 @@ void amf_cluster_sync_ready (struct amf_cluster *cluster, struct amf_node *node)
+ void amf_cluster_application_started (
+ struct amf_cluster *cluster, struct amf_application *application)
+ {
+- ENTER ("application '%s' started %d", application->name.value,
+- cluster->acsm_state);
++ ENTER();
+ switch (cluster->acsm_state) {
+ case CLUSTER_AC_STARTING_APPLICATIONS:
+ if (cluster_applications_started_instantiated (cluster)) {
+@@ -479,7 +478,7 @@ void amf_cluster_application_started (
+ void amf_cluster_application_workload_assigned (
+ struct amf_cluster *cluster, struct amf_application *app)
+ {
+- ENTER ("");
++ ENTER();
+ switch (cluster->acsm_state) {
+ case CLUSTER_AC_ASSIGNING_WORKLOAD:
+ log_printf (LOG_NOTICE, "Cluster: application %s assigned.",
+diff --git a/services/amfcomp.c b/services/amfcomp.c
+index 5393713..6354d0a 100644
+--- a/services/amfcomp.c
++++ b/services/amfcomp.c
+@@ -319,8 +319,7 @@ static void report_error_suspected (
+ struct amf_comp *comp,
+ SaAmfRecommendedRecoveryT recommended_recovery)
+ {
+- ENTER ("%s, recommended_recovery = %d",
+- comp->name.value, recommended_recovery);
++ ENTER();
+ amf_comp_error_suspected_set (comp);
+ comp_recover_action (comp, recommended_recovery);
+ }
+@@ -512,7 +511,7 @@ static void amf_comp_cleanup_tmo (void *component)
+
+ static void start_component_instantiate_timer (struct amf_comp *component)
+ {
+- ENTER("%s",component->name.value);
++ ENTER();
+ if (component->instantiate_timeout_handle == 0) {
+ api->timer_add_duration (
+ component->saAmfCompInstantiateTimeout * MILLI_2_NANO_SECONDS,
+@@ -524,7 +523,7 @@ static void start_component_instantiate_timer (struct amf_comp *component)
+
+ static void start_component_cleanup_timer (struct amf_comp *component)
+ {
+- ENTER("%s",component->name.value);
++ ENTER();
+ if (component->cleanup_timeout_handle == 0) {
+ api->timer_add_duration (
+ component->saAmfCompCleanupTimeout * MILLI_2_NANO_SECONDS,
+@@ -536,7 +535,7 @@ static void start_component_cleanup_timer (struct amf_comp *component)
+
+ void stop_component_cleanup_timer (struct amf_comp *component)
+ {
+- ENTER("%s",component->name.value);
++ ENTER();
+
+ if (component->cleanup_timeout_handle != 0) {
+ api->timer_delete (
+@@ -556,7 +555,7 @@ static int clc_cli_instantiate (struct amf_comp *comp)
+
+ struct clc_command_run_data *clc_command_run_data;
+
+- ENTER("comp '%s'\n", getSaNameT (&comp->name));
++ ENTER();
+
+ clc_command_run_data = amf_malloc (sizeof (struct clc_command_run_data));
+ clc_command_run_data->comp = comp;
+@@ -575,13 +574,13 @@ static int clc_cli_instantiate (struct amf_comp *comp)
+
+ static int clc_instantiate_callback (struct amf_comp *comp)
+ {
+- ENTER("comp %s\n", getSaNameT (&comp->name));
++ ENTER();
+ return (0);
+ }
+
+ static int clc_csi_set_callback (struct amf_comp *comp)
+ {
+- ENTER("comp %s\n", getSaNameT (&comp->name));
++ ENTER();
+ return (0);
+ }
+
+@@ -590,7 +589,7 @@ static int clc_csi_set_callback (struct amf_comp *comp)
+ */
+ static int clc_cli_terminate (struct amf_comp *comp)
+ {
+- ENTER("comp %s\n", getSaNameT (&comp->name));
++ ENTER();
+ return (0);
+ }
+
+@@ -605,7 +604,7 @@ static int lib_comp_terminate_request (struct amf_comp *comp)
+ struct res_lib_amf_componentterminatecallback res_lib;
+ struct component_terminate_callback_data *component_terminate_callback_data;
+
+- ENTER("comp %s\n", getSaNameT (&comp->name));
++ ENTER();
+
+ res_lib.header.id = MESSAGE_RES_AMF_COMPONENTTERMINATECALLBACK;
+ res_lib.header.size = sizeof (struct res_lib_amf_componentterminatecallback);
+@@ -912,7 +911,7 @@ void amf_comp_healthcheck_deactivate (struct amf_comp *comp)
+ if (!amf_su_is_local (comp->su))
+ return;
+
+- ENTER ("'%s'\n", getSaNameT (&comp->name));
++ ENTER();
+
+ for (healthcheck = comp->healthcheck_head;
+ healthcheck != NULL;
+@@ -1168,10 +1167,7 @@ static void lib_csi_set_request (
+
+ csi = csi_assignment->csi;
+
+- ENTER ("Assigning CSI '%s' state %s to comp '%s'\n",
+- getSaNameT (&csi->name),
+- amf_ha_state (csi_assignment->requested_ha_state),
+- comp->name.value);
++ ENTER();
+
+ for (attribute = csi->attributes_head;
+ attribute != NULL;
+@@ -1254,7 +1250,7 @@ static void lib_csi_set_request (
+
+ static void stop_component_instantiate_timer (struct amf_comp *component)
+ {
+- ENTER("%s",component->name.value);
++ ENTER();
+
+ if (component->instantiate_timeout_handle) {
+ dprintf ("Stop component instantiate timer");
+@@ -1330,7 +1326,7 @@ void amf_comp_healthcheck_tmo (
+ static void clear_ha_state (
+ struct amf_comp *comp, struct amf_csi_assignment *csi_assignment)
+ {
+- ENTER ("");
++ ENTER();
+ csi_assignment->saAmfCSICompHAState = 0;
+ }
+
+@@ -1340,8 +1336,7 @@ static void comp_recover_action (amf_comp_t *comp,
+ {
+
+
+- ENTER ("%s %d %d", comp->name.value,recommendedRecovery,
+- comp->saAmfCompRecoveryOnError);
++ ENTER();
+
+ amf_node_t *node = amf_node_find (&comp->su->saAmfSUHostedByNode);
+ switch (recommendedRecovery) {
+@@ -1430,7 +1425,7 @@ static void comp_recover_action (amf_comp_t *comp,
+ */
+ void amf_comp_cleanup_failed_completed (amf_comp_t *comp)
+ {
+- ENTER ("'%s'", comp->name.value);
++ ENTER();
+
+ stop_component_cleanup_timer (comp);
+ amf_comp_error_suspected_clear (comp);
+@@ -1843,8 +1838,7 @@ SaAisErrorT amf_comp_healthcheck_stop (
+ */
+ void amf_comp_instantiate (struct amf_comp *comp)
+ {
+- ENTER ("'%s' SU '%s'", getSaNameT (&comp->name),
+- getSaNameT (&comp->su->name));
++ ENTER();
+
+ switch (comp->saAmfCompPresenceState) {
+ case SA_AMF_PRESENCE_RESTARTING:
+@@ -1868,9 +1862,7 @@ void amf_comp_instantiate (struct amf_comp *comp)
+
+ void amf_comp_cleanup_tmo_event (struct amf_comp *comp)
+ {
+- ENTER ("Comp cleanup timeout after %d ms '%s' '%s'",
+- comp->saAmfCompCleanupTimeout, comp->su->name.value,
+- comp->name.value);
++ ENTER();
+ amf_comp_error_suspected_clear(comp);
+ amf_comp_operational_state_set (comp, SA_AMF_OPERATIONAL_DISABLED);
+ comp_presence_state_set (comp, SA_AMF_PRESENCE_TERMINATION_FAILED);
+@@ -1878,9 +1870,7 @@ void amf_comp_cleanup_tmo_event (struct amf_comp *comp)
+
+ void amf_comp_instantiate_tmo_event (struct amf_comp *comp)
+ {
+- ENTER ("Comp instantiate timeout after %d ms '%s' '%s'",
+- comp->saAmfCompInstantiateTimeout, comp->su->name.value,
+- comp->name.value);
++ ENTER();
+
+ switch (comp->saAmfCompPresenceState) {
+ case SA_AMF_PRESENCE_RESTARTING:
+@@ -1906,7 +1896,7 @@ void amf_comp_instantiate_tmo_event (struct amf_comp *comp)
+ void amf_comp_instantiate_event (struct amf_comp *component)
+ {
+ int res;
+- ENTER ("");
++ ENTER();
+ switch (component->saAmfCompPresenceState) {
+ case SA_AMF_PRESENCE_INSTANTIATING:
+ case SA_AMF_PRESENCE_INSTANTIATED:
+@@ -2072,7 +2062,7 @@ struct amf_comp *amf_comp_response_2 (SaUint32T interface, SaNameT *dn,
+
+ switch (interface) {
+ case AMF_RESPONSE_CSISETCALLBACK: {
+- ENTER("'%s'", dn->value);
++ ENTER();
+ csi_assignment = amf_csi_assignment_find (amf_cluster, dn);
+ assert (csi_assignment != NULL);
+ comp = csi_assignment->comp;
+@@ -2092,7 +2082,7 @@ struct amf_comp *amf_comp_response_2 (SaUint32T interface, SaNameT *dn,
+ break;
+ }
+ case AMF_RESPONSE_CSIREMOVECALLBACK: {
+- ENTER("'%s'", dn->value);
++ ENTER();
+ csi_assignment = amf_csi_assignment_find (amf_cluster, dn);
+ assert (csi_assignment != NULL);
+ dprintf ("Lib csi '%s' remove callback response from '%s', error: %d",
+@@ -2149,7 +2139,7 @@ void amf_comp_hastate_set (
+ struct amf_comp *component,
+ struct amf_csi_assignment *csi_assignment)
+ {
+- ENTER ("'%s'", csi_assignment->csi->name.value);
++ ENTER();
+
+ assert (component != NULL && csi_assignment != NULL);
+
+@@ -2166,7 +2156,7 @@ void amf_comp_hastate_set (
+ }
+ }
+
+- LEAVE("");
++ LEAVE();
+ }
+
+ /**
+@@ -2366,7 +2356,7 @@ void amf_comp_node_left (struct amf_comp *component)
+ int change_pending = 0;
+ struct amf_csi_assignment *csi_assignment;
+
+- ENTER("saAmfCompPresenceState = %d", component->saAmfCompPresenceState);
++ ENTER();
+ amf_comp_error_suspected_clear (component);
+ if (component->saAmfCompPresenceState == SA_AMF_PRESENCE_INSTANTIATING ||
+ component->saAmfCompPresenceState == SA_AMF_PRESENCE_RESTARTING ||
+@@ -2713,7 +2703,7 @@ void amf_comp_csi_remove (amf_comp_t *component,
+ {
+ struct res_lib_amf_csiremovecallback res_lib;
+
+- ENTER("");
++ ENTER();
+
+ res_lib.header.id = MESSAGE_RES_AMF_CSIREMOVECALLBACK;
+ res_lib.header.size = sizeof (struct res_lib_amf_csiremovecallback);
+diff --git a/services/amfnode.c b/services/amfnode.c
+index b5e18be..9586326 100644
+--- a/services/amfnode.c
++++ b/services/amfnode.c
+@@ -203,7 +203,7 @@ LOGSYS_DECLARE_SUBSYS ("AMF", LOG_INFO)
+
+ static void node_acsm_enter_leaving_spontaneously(struct amf_node *node)
+ {
+- ENTER("'%s'", node->name.value);
++ ENTER();
+ node->saAmfNodeOperState = SA_AMF_OPERATIONAL_DISABLED;
+ node->nodeid = 0;
+ }
+@@ -215,7 +215,7 @@ static void node_acsm_enter_failing_over (struct amf_node *node)
+ struct amf_su *su;
+ struct amf_comp *component = NULL;
+
+- ENTER("'%s'", node->name.value);
++ ENTER();
+ node->acsm_state = NODE_ACSM_LEAVING_SPONTANEOUSLY_FAILING_OVER;
+ /*
+ * Indicate to each component object in the model that current
+@@ -267,7 +267,7 @@ static void failover_all_sg_on_node (amf_node_t *node)
+
+ static void node_acsm_enter_failing_gracefully_failing_over (amf_node_t *node)
+ {
+- ENTER("%s", node->name.value);
++ ENTER();
+ node->acsm_state = NODE_ACSM_FAILING_GRACEFULLY_FAILING_OVER;
+ failover_all_sg_on_node (node);
+ }
+@@ -301,7 +301,7 @@ out:
+
+ static void repair_node (amf_node_t *node)
+ {
+- ENTER("");
++ ENTER();
+ char hostname[256];
+ gethostname (hostname, 256);
+ if (!strcmp (hostname, (const char*)node->saAmfNodeClmNode.value)) {
+@@ -316,14 +316,14 @@ static void repair_node (amf_node_t *node)
+
+ static void enter_failing_gracefully_rebooting_node (amf_node_t *node)
+ {
+- ENTER("");
++ ENTER();
+ node->acsm_state = NODE_ACSM_FAILING_GRACEFULLY_REBOOTING_NODE;
+ repair_node (node);
+ }
+
+ static void node_acsm_enter_idle (amf_node_t *node)
+ {
+- ENTER ("history_state=%d",node->history_state);
++ ENTER();
+ node->acsm_state = node->history_state;
+ }
+
+@@ -334,7 +334,7 @@ static void node_acsm_enter_joining_assigning_workload (struct amf_node *node,
+ "Node=%s: all applications started, assigning workload.",
+ node->name.value);
+
+- ENTER("");
++ ENTER();
+ node->acsm_state = NODE_ACSM_JOINING_ASSIGNING_WORKLOAD;
+ for (app = app->cluster->application_head; app != NULL;
+ app = app->next) {
+@@ -355,9 +355,7 @@ static void node_acsm_enter_joining_assigning_workload (struct amf_node *node,
+ void amf_node_leave (struct amf_node *node)
+ {
+ assert (node != NULL);
+- ENTER("'%s', CLM node '%s'", node->name.value,
+- node->saAmfNodeClmNode.value);
+-
++ ENTER();
+
+ switch (node->acsm_state) {
+ case NODE_ACSM_IDLE_ESCALLATION_LEVEL_0:
+@@ -389,8 +387,7 @@ void amf_node_leave (struct amf_node *node)
+ void amf_node_failover (struct amf_node *node)
+ {
+ assert (node != NULL);
+- ENTER("'%s', CLM node '%s'", node->name.value,
+- node->saAmfNodeClmNode.value);
++ ENTER();
+
+ switch (node->acsm_state) {
+ case NODE_ACSM_IDLE_ESCALLATION_LEVEL_0:
+@@ -438,7 +435,7 @@ void amf_node_failfast (struct amf_node *node)
+ void amf_node_comp_restart_req (struct amf_node *node, struct amf_comp *comp)
+ {
+ amf_su_t *su = comp->su;
+- ENTER("");
++ ENTER();
+ switch (node->acsm_state) {
+ case NODE_ACSM_IDLE_ESCALLATION_LEVEL_0:
+ node->acsm_state = NODE_ACSM_IDLE_ESCALLATION_LEVEL_2;
+@@ -494,7 +491,7 @@ void amf_node_comp_restart_req (struct amf_node *node, struct amf_comp *comp)
+ */
+ void amf_node_comp_failover_req (amf_node_t *node, amf_comp_t *comp)
+ {
+- ENTER("");
++ ENTER();
+ switch (node->acsm_state) {
+ case NODE_ACSM_IDLE_ESCALLATION_LEVEL_0:
+ case NODE_ACSM_IDLE_ESCALLATION_LEVEL_2:
+@@ -578,8 +575,7 @@ void amf_node_application_started (struct amf_node *node,
+ struct amf_application *app)
+ {
+ assert (node != NULL && app != NULL );
+- ENTER ("Node=%s: application '%s' started", node->name.value,
+- app->name.value);
++ ENTER();
+
+ switch (node->acsm_state) {
+ case NODE_ACSM_JOINING_STARTING_APPLICATIONS:
+@@ -608,8 +604,7 @@ void amf_node_application_workload_assigned (struct amf_node *node,
+ struct amf_application *app)
+ {
+ assert (node != NULL && app != NULL );
+- ENTER ("Node=%s: application '%s' started", node->name.value,
+- app->name.value);
++ ENTER();
+
+ switch (node->acsm_state) {
+ case NODE_ACSM_JOINING_ASSIGNING_WORKLOAD:
+@@ -638,8 +633,7 @@ void amf_node_application_workload_assigned (struct amf_node *node,
+ void amf_node_sg_failed_over (struct amf_node *node, struct amf_sg *sg_in)
+ {
+ assert (node != NULL);
+- ENTER ("Node=%s: SG '%s' started %d", node->name.value,
+- sg_in->name.value,node->acsm_state);
++ ENTER();
+
+ switch (node->acsm_state) {
+ case NODE_ACSM_LEAVING_SPONTANEOUSLY_FAILING_OVER:
+diff --git a/services/amfsg.c b/services/amfsg.c
+index e3a9d8b..bdd5613 100644
+--- a/services/amfsg.c
++++ b/services/amfsg.c
+@@ -429,7 +429,7 @@ static void sg_set_event (amf_sg_event_type_t sg_event_type,
+ static void sg_defer_event (amf_sg_event_type_t event_type,
+ sg_event_t *sg_event)
+ {
+- ENTER("Defered event = %d", event_type);
++ ENTER();
+ amf_fifo_put (event_type, &sg_event->sg->deferred_events,
+ sizeof (sg_event_t),
+ sg_event);
+@@ -439,7 +439,7 @@ static void sg_recall_deferred_events (amf_sg_t *sg)
+ {
+ sg_event_t sg_event;
+
+- ENTER ("%s", sg->name.value);
++ ENTER();
+ if (amf_fifo_get (&sg->deferred_events, &sg_event)) {
+ switch (sg_event.event_type) {
+ case SG_FAILOVER_SU_EV:
+@@ -464,7 +464,7 @@ static void sg_recall_deferred_events (amf_sg_t *sg)
+ static void timer_function_sg_recall_deferred_events (void *data)
+ {
+ amf_sg_t *sg = (amf_sg_t*)data;
+- ENTER ("");
++ ENTER();
+
+ sg_recall_deferred_events (sg);
+ }
+@@ -473,7 +473,7 @@ static void acsm_enter_idle (amf_sg_t *sg)
+ {
+ SaNameT dn;
+
+- ENTER ("sg: %s state: %d", sg->name.value, sg->avail_state);
++ ENTER();
+
+ sg->avail_state = SG_AC_Idle;
+ if (sg->recovery_scope.event_type != 0) {
+@@ -604,7 +604,7 @@ static int is_any_si_in_scope_assigned_standby (struct amf_sg *sg)
+ static void acsm_enter_terminating_suspected (struct amf_sg *sg)
+ {
+ struct amf_su **sus= sg->recovery_scope.sus;
+- ENTER("%s",sg->name.value);
++ ENTER();
+ sg->avail_state = SG_AC_TerminatingSuspected;
+ /*
+ * Terminate suspected SU(s)
+@@ -636,7 +636,7 @@ static void timer_function_dependent_si_deactivated2 (void *data)
+ {
+ amf_sg_t *sg = (amf_sg_t *)data;
+
+- ENTER ("");
++ ENTER();
+ dependent_si_deactivated_cbfn2 (sg);
+ }
+
+@@ -712,7 +712,7 @@ static void acsm_enter_deactivating_dependent_workload (amf_sg_t *sg)
+
+ sg->avail_state = SG_AC_DeactivatingDependantWorkload;
+
+- ENTER("'%s'",sg->name.value);
++ ENTER();
+ /*
+ * For each SI in the recovery scope, find all active
+ * assignments and request them to be deactivated.
+@@ -746,7 +746,7 @@ static void acsm_enter_deactivating_dependent_workload (amf_sg_t *sg)
+
+ if (callback_pending == 0) {
+ static corosync_timer_handle_t dependent_si_deactivated_handle;
+- ENTER("");
++ ENTER();
+ api->timer_add_duration (
+ 0, sg,
+ timer_function_dependent_si_deactivated2,
+@@ -764,7 +764,7 @@ static void acsm_enter_activating_standby (struct amf_sg *sg)
+ struct amf_si_assignment *si_assignment;
+ int is_no_standby_activated = 1;
+
+- ENTER("'%s'",sg->name.value);
++ ENTER();
+ sg->avail_state = SG_AC_ActivatingStandby;
+
+ /*
+@@ -800,7 +800,7 @@ static void acsm_enter_repairing_su (struct amf_sg *sg)
+ int is_any_su_instantiated = 0;
+ const int PERFORMS_INSTANTIATING = 1;
+
+- ENTER("'%s'",sg->name.value);
++ ENTER();
+ sg->avail_state = SG_AC_ReparingSu;
+ /*
+ * Instantiate SUs in current recovery scope until the configured
+@@ -835,7 +835,7 @@ static void acsm_enter_repairing_su (struct amf_sg *sg)
+ static inline void remove_all_suspected_sus (amf_sg_t *sg)
+ {
+ amf_su_t *su;
+- ENTER("");
++ ENTER();
+ for (su = sg->su_head; su != NULL; su =su->next) {
+
+ amf_comp_t *component;
+@@ -946,7 +946,7 @@ static int is_spare_sus (amf_sg_t *sg)
+ */
+ static void assume_standby_si_assignment_for_spare_sus (amf_sg_t *sg)
+ {
+- ENTER("");
++ ENTER();
+
+ assign_si (sg, 0);
+ }
+@@ -957,7 +957,7 @@ static void assume_standby_si_assignment_for_spare_sus (amf_sg_t *sg)
+ */
+ static void acsm_enter_assigning_standby_to_spare (amf_sg_t *sg)
+ {
+- ENTER("%s", sg->name.value);
++ ENTER();
+
+ sg->avail_state = SG_AC_AssigningStandbyToSpare;
+ if (is_spare_sus (sg)) {
+@@ -1006,7 +1006,7 @@ static void add_si_to_scope ( struct amf_sg *sg, struct amf_si *si)
+ int number_of_si = 2; /* It shall be at least two */
+ struct amf_si **tmp_sis= sg->recovery_scope.sis;
+
+- ENTER ("'%s'", si->name.value);
++ ENTER();
+
+ while (*tmp_sis != NULL) {
+ number_of_si++;
+@@ -1037,7 +1037,7 @@ static void add_su_to_scope (struct amf_sg *sg, struct amf_su *su)
+ int number_of_su = 2; /* It shall be at least two */
+ struct amf_su **tmp_sus= sg->recovery_scope.sus;
+
+- ENTER ("'%s'", su->name.value);
++ ENTER();
+ while (*tmp_sus != NULL) {
+ number_of_su++;
+ tmp_sus++;
+@@ -1116,7 +1116,7 @@ static void set_scope_for_failover_node (struct amf_sg *sg, struct amf_node *nod
+ struct amf_su **sus;
+ struct amf_su *su;
+
+- ENTER ("'%s'", node->name.value);
++ ENTER();
+ sg->recovery_scope.event_type = SG_FAILOVER_NODE_EV;
+ sg->recovery_scope.node = node;
+ sg->recovery_scope.comp = NULL;
+@@ -1205,7 +1205,7 @@ static void delete_si_assignments (struct amf_su *su)
+ struct amf_si_assignment *si_assignment;
+ struct amf_si_assignment **prev;
+
+- ENTER ("'%s'", su->name.value);
++ ENTER();
+
+ for (si = su->sg->application->si_head; si != NULL; si = si->next) {
+
+@@ -1299,7 +1299,7 @@ static void removed_si_assignment_callback_fn (void *si_assignment_in)
+ {
+ amf_si_assignment_t *si_assignment = si_assignment_in;
+
+- ENTER("");
++ ENTER();
+ delete_si_assignment (si_assignment);
+
+ /*
+@@ -1323,7 +1323,7 @@ static int remove_standby_si_assignments (amf_sg_t *sg)
+ amf_su_t *standby_su;
+ int removed = 0;
+
+- ENTER("'%s'", sg->name.value);
++ ENTER();
+
+ /*
+ * For each SI in the recovery scope, find a standby
+@@ -1375,7 +1375,7 @@ static int remove_standby_si_assignments (amf_sg_t *sg)
+ */
+ static void acsm_enter_removing_standby_assignments (amf_sg_t *sg)
+ {
+- ENTER("SG: %s", sg->name.value);
++ ENTER();
+ sg->avail_state = SG_AC_RemovingStandbyAssignments;
+
+ if (sg->saAmfSGRedundancyModel == SA_AMF_NPM_REDUNDANCY_MODEL) {
+@@ -1530,7 +1530,7 @@ static int sg_assign_active_nplusm (struct amf_sg *sg, int su_active_assign)
+ int si_left;
+ int si_total;
+ int su_left_to_assign = su_active_assign;
+- ENTER("SG: %s", sg->name.value);
++ ENTER();
+
+ si_total = sg_si_count_get (sg);
+ si_left = si_total;
+@@ -1593,7 +1593,7 @@ static int sg_assign_standby_nplusm (struct amf_sg *sg, int su_standby_assign)
+ int si_total;
+ int su_left_to_assign = su_standby_assign;
+
+- ENTER ("'%s'", sg->name.value);
++ ENTER();
+
+ if (su_standby_assign == 0) {
+ return 0;
+@@ -1726,7 +1726,7 @@ static int assign_si (struct amf_sg *sg, int dependency_level)
+ int assigned = 0;
+ int active_out_of_service = 0;
+ int standby_out_of_service = 0;
+- ENTER ("'%s'", sg->name.value);
++ ENTER();
+
+ /**
+ * Phase 1: Calculate assignments and create all runtime objects in
+@@ -1851,7 +1851,7 @@ static int assign_si (struct amf_sg *sg, int dependency_level)
+ }
+ }
+
+- LEAVE ("'%s'", sg->name.value);
++ LEAVE ();
+ return assigned;
+ }
+
+@@ -1948,7 +1948,7 @@ out:
+ */
+ static void sg_su_state_changed_to_instantiated (struct amf_sg *sg, struct amf_su *su)
+ {
+- ENTER("%s %s",sg->name.value, su->name.value);
++ ENTER();
+ switch (sg->avail_state) {
+ case SG_AC_InstantiatingServiceUnits:
+ if (no_su_has_presence_state(sg, sg->node_to_start,
+@@ -1990,7 +1990,7 @@ static void sg_su_state_changed_to_instantiated (struct amf_sg *sg, struct amf_s
+ static void amf_sg_su_state_changed_to_uninstantiated (amf_sg_t *sg,
+ amf_su_t *su)
+ {
+- ENTER("%s %s",sg->name.value, su->name.value);
++ ENTER();
+ switch (sg->avail_state) {
+ case SG_AC_TerminatingSuspected:
+ if (no_su_has_presence_state(sg, sg->node_to_start,
+@@ -2042,7 +2042,7 @@ static void amf_sg_su_state_changed_to_uninstantiated (amf_sg_t *sg,
+ static void amf_sg_su_state_changed_to_termination_failed (amf_sg_t *sg,
+ amf_su_t *su)
+ {
+- ENTER("%s %s",sg->name.value, su->name.value);
++ ENTER();
+ if (no_su_has_presence_state(sg, sg->node_to_start,
+ SA_AMF_PRESENCE_TERMINATING)) {
+ if (is_comp_in_active_ha_state_nplusm (sg, su)) {
+@@ -2078,7 +2078,7 @@ out:
+ static void amf_sg_su_state_changed_to_instantiation_failed (amf_sg_t *sg,
+ amf_su_t *su)
+ {
+- ENTER("%s %s",sg->name.value, su->name.value);
++ ENTER();
+ switch (sg->avail_state) {
+ case SG_AC_InstantiatingServiceUnits:
+ if (no_su_has_presence_state(sg, sg->node_to_start,
+@@ -2123,7 +2123,7 @@ int amf_sg_start (struct amf_sg *sg, struct amf_node *node)
+ {
+
+ sg->recovery_scope.event_type = SG_START_EV;
+- ENTER ("'%s'", sg->name.value);
++ ENTER();
+ int instantiated_sus = 0;
+
+ switch (sg->avail_state) {
+@@ -2133,7 +2133,7 @@ int amf_sg_start (struct amf_sg *sg, struct amf_node *node)
+ amf_su_t *su;
+ sg_avail_control_state_t old_avail_state = sg->avail_state;
+
+- ENTER ("'%s'", sg->name.value);
++ ENTER();
+
+ sg->node_to_start = node;
+
+@@ -2221,7 +2221,7 @@ int amf_sg_assign_si_req (struct amf_sg *sg, int dependency_level)
+ */
+ void amf_sg_failover_node_req (struct amf_sg *sg, struct amf_node *node)
+ {
+- ENTER("'%s, %s'",node->name.value, sg->name.value);
++ ENTER();
+ sg_event_t sg_event;
+
+ switch (sg->avail_state) {
+@@ -2239,8 +2239,7 @@ void amf_sg_failover_node_req (struct amf_sg *sg, struct amf_node *node)
+ while (*sus != NULL) {
+
+ amf_su_t *su = *sus;
+- ENTER("SU %s pr_state='%d'",su->name.value,
+- su->saAmfSUPresenceState);
++ ENTER();
+
+ if (su_presense_state_is_ored (su,
+ SA_AMF_PRESENCE_UNINSTANTIATED,
+@@ -2296,7 +2295,7 @@ void amf_sg_failover_node_req (struct amf_sg *sg, struct amf_node *node)
+ void amf_sg_failover_su_req (struct amf_sg *sg, struct amf_su *su,
+ struct amf_node *node)
+ {
+- ENTER ("%s", su->name.value);
++ ENTER();
+ sg_event_t sg_event;
+
+ switch (sg->avail_state) {
+@@ -2340,7 +2339,7 @@ void amf_sg_failover_su_req (struct amf_sg *sg, struct amf_su *su,
+ void amf_sg_su_state_changed_2 (struct amf_sg *sg,
+ struct amf_su *su, SaAmfStateT type, int state)
+ {
+- ENTER ("'%s' SU '%s' state %s",
++ ENTER();
+ sg->name.value, su->name.value, amf_presence_state(state));
+
+ if (type == SA_AMF_PRESENCE_STATE) {
+@@ -2467,8 +2466,7 @@ void amf_sg_su_state_changed_2 (struct amf_sg *sg,
+ void amf_sg_su_state_changed (struct amf_sg *sg, struct amf_su *su,
+ SaAmfStateT type, int state)
+ {
+- ENTER ("'%s' SU '%s' state %s",
+- sg->name.value, su->name.value, amf_presence_state(state));
++ ENTER();
+
+ if (sg->avail_state != SG_AC_Idle) {
+ if (type == SA_AMF_PRESENCE_STATE) {
+@@ -2510,7 +2508,7 @@ static void dependent_si_deactivated_cbfn2 (struct amf_sg *sg)
+ {
+ struct amf_su **sus = sg->recovery_scope.sus;
+
+- ENTER("'%s'", sg->name.value);
++ ENTER();
+
+ /*
+ * Select next state depending on if some
+@@ -2520,8 +2518,7 @@ static void dependent_si_deactivated_cbfn2 (struct amf_sg *sg)
+ while (*sus != NULL) {
+ amf_su_t *su = *sus;
+
+- ENTER("SU %s pr_state='%d'",su->name.value,
+- su->saAmfSUPresenceState);
++ ENTER();
+
+ if (su_presense_state_is_ored (su,
+ SA_AMF_PRESENCE_UNINSTANTIATED,
+@@ -2554,7 +2551,7 @@ static void dependent_si_deactivated_cbfn (
+ struct amf_su **sus = sg->recovery_scope.sus;
+ struct amf_su *su;
+
+- ENTER ("'%s', %d", si_assignment->si->name.value, result);
++ ENTER();
+
+ /*
+ * If all SI assignments for all SUs in the SG are not pending,
+@@ -2599,7 +2596,7 @@ still_wating:
+ acsm_enter_removing_standby_assignments (sg);
+ }
+ }
+- LEAVE("");
++ LEAVE();
+ }
+
+ /**
+@@ -2615,7 +2612,7 @@ static void assign_si_assumed_cbfn (
+ int si_assignment_cnt = 0;
+ int confirmed_assignments = 0;
+
+- ENTER ("'%s', %d", si_assignment->si->name.value, result);
++ ENTER();
+
+
+ switch (sg->avail_state) {
+@@ -2680,7 +2677,7 @@ static void standby_su_activated_cbfn (
+ struct amf_su **sus = si_assignment->su->sg->recovery_scope.sus;
+ struct amf_si **sis = si_assignment->su->sg->recovery_scope.sis;
+
+- ENTER ("'%s', %d", si_assignment->si->name.value, result);
++ ENTER();
+
+ /*
+ * If all SI assignments for all SIs in the scope are activated, goto next
+diff --git a/services/amfsi.c b/services/amfsi.c
+index 4546485..ed43882 100644
+--- a/services/amfsi.c
++++ b/services/amfsi.c
+@@ -297,7 +297,7 @@ char *amf_csi_dn_make (struct amf_csi *csi, SaNameT *name)
+ void amf_si_comp_set_ha_state_done (
+ struct amf_si *si, struct amf_csi_assignment *csi_assignment)
+ {
+- ENTER ("'%s', '%s'", si->name.value, csi_assignment->csi->name.value);
++ ENTER();
+
+ set_si_ha_state (csi_assignment);
+
+@@ -322,7 +322,7 @@ void amf_si_activate (
+ {
+ struct amf_csi *csi;
+
+- ENTER ("'%s'", si->name.value);
++ ENTER();
+
+ for (csi = si->csi_head; csi != NULL; csi = csi->next) {
+ struct amf_csi_assignment *csi_assignment;
+@@ -346,7 +346,7 @@ void amf_si_activate (
+ void amf_si_comp_set_ha_state_failed (
+ struct amf_si *si, struct amf_csi_assignment *csi_assignment)
+ {
+- ENTER ("");
++ ENTER();
+ assert (0);
+ }
+
+@@ -354,7 +354,7 @@ static void timer_function_ha_state_assumed (void *_si_assignment)
+ {
+ struct amf_si_assignment *si_assignment = _si_assignment;
+
+- ENTER ("");
++ ENTER();
+ si_assignment->saAmfSISUHAState = si_assignment->requested_ha_state;
+ si_assignment->assumed_callback_fn (si_assignment, 0);
+ }
+@@ -369,9 +369,7 @@ void amf_si_ha_state_assume (
+ int csi_assignment_cnt = 0;
+ int hastate_set_done_cnt = 0;
+
+- ENTER ("SI '%s' SU '%s' state %s", si_assignment->si->name.value,
+- si_assignment->su->name.value,
+- amf_ha_state (si_assignment->requested_ha_state));
++ ENTER();
+
+ si_assignment->assumed_callback_fn = assumed_ha_state_callback_fn;
+ for (csi = si_assignment->si->csi_head; csi != NULL; csi = csi->next) {
+@@ -509,7 +507,7 @@ SaAmfAssignmentStateT amf_si_get_saAmfSIAssignmentState (struct amf_si *si)
+ void amf_csi_delete_assignments (struct amf_csi *csi, struct amf_su *su)
+ {
+ struct amf_csi_assignment *csi_assignment;
+- ENTER ("'%s'", su->name.value);
++ ENTER();
+ struct amf_csi_assignment **prev = &csi->assigned_csis;
+
+ for (csi_assignment = csi->assigned_csis; csi_assignment != NULL;
+@@ -1000,9 +998,7 @@ void amf_si_assignment_remove (amf_si_assignment_t *si_assignment,
+ struct amf_csi *csi;
+ int csi_assignment_cnt = 0;
+
+- ENTER ("SI '%s' SU '%s' state %s", si_assignment->si->name.value,
+- si_assignment->su->name.value,
+- amf_ha_state (si_assignment->requested_ha_state));
++ ENTER();
+
+ si_assignment->requested_ha_state = USR_AMF_HA_STATE_REMOVED;
+ si_assignment->removed_callback_fn = async_func;
+@@ -1042,7 +1038,7 @@ void amf_si_comp_csi_removed (
+ struct amf_si *si, struct amf_csi_assignment *csi_assignment,
+ SaAisErrorT error)
+ {
+- ENTER ("'%s', '%s'", si->name.value, csi_assignment->csi->name.value);
++ ENTER();
+
+ assert (csi_assignment->si_assignment->removed_callback_fn != NULL);
+
+diff --git a/services/amfsu.c b/services/amfsu.c
+index 2f21e50..fe9170b 100644
+--- a/services/amfsu.c
++++ b/services/amfsu.c
+@@ -421,7 +421,7 @@ static void su_defer_event (amf_su_t *su, amf_comp_t *comp,
+ su_event_t event;
+ su_event_set(su, comp, recommended_recovery,&event, su_event_type);
+
+- ENTER("event_type = %d", event.event_type);
++ ENTER();
+ amf_fifo_put (event.event_type, &event.su->deferred_events,
+ sizeof (su_event_t), &event);
+ }
+@@ -430,7 +430,7 @@ static void su_recall_deferred_events (amf_su_t *su)
+ {
+ su_event_t su_event;
+
+- ENTER ("%s", su->name.value);
++ ENTER();
+ if (amf_fifo_get (&su->deferred_events, &su_event)) {
+ switch (su_event.event_type) {
+ case SU_COMP_ERROR_SUSPECTED_EV:
+@@ -472,7 +472,7 @@ static void su_readiness_state_set (struct amf_su *su,
+ static void clear_ha_state (
+ struct amf_su *su, struct amf_si_assignment *si_assignment)
+ {
+- ENTER ("");
++ ENTER();
+ si_assignment->saAmfSISUHAState = 0;
+ }
+
+@@ -584,7 +584,7 @@ static void comp_restart (struct amf_comp *comp)
+ {
+ SaNameT dn;
+
+- ENTER ("'%s'", comp->name.value);
++ ENTER();
+ amf_comp_dn_make (comp, &dn);
+ log_printf (LOG_NOTICE, "Error detected for '%s', recovery "
+ "action: Component restart", dn.value);
+@@ -609,7 +609,7 @@ static void reassume_ha_state(struct amf_su *su)
+ {
+ struct amf_si_assignment *si_assignment;
+
+- ENTER ("");
++ ENTER();
+
+ si_assignment = amf_su_get_next_si_assignment(su, NULL);
+
+@@ -729,8 +729,7 @@ void su_history_state_set(struct amf_su *su, SaAmfPresenceStateT state)
+ static void su_comp_presence_state_changed (struct amf_su *su,
+ struct amf_comp *comp, int state)
+ {
+- ENTER ("'%s', '%s' %d %d", su->name.value, comp->name.value, state,
+- su->restart_control_state);
++ ENTER();
+ amf_node_t *node = amf_node_find (&comp->su->saAmfSUHostedByNode);
+ switch (state) {
+ case SA_AMF_PRESENCE_INSTANTIATED:
+@@ -965,7 +964,7 @@ static void su_comp_presence_state_changed (struct amf_su *su,
+ static void su_comp_op_state_changed (
+ struct amf_su *su, struct amf_comp *comp, int state)
+ {
+- ENTER ("'%s', '%s' %d", su->name.value, comp->name.value, state);
++ ENTER();
+
+ switch (state) {
+ case SA_AMF_OPERATIONAL_ENABLED:
+@@ -1064,7 +1063,7 @@ static int are_all_comps_in_level_uninst_or_term_failed(
+ static void su_rc_enter_idle_escalation_level_1 (amf_comp_t *component,
+ SaAmfRecommendedRecoveryT recommended_recovery)
+ {
+- ENTER("");
++ ENTER();
+ component->su->restart_control_state = SU_RC_IDLE_ESCALATION_LEVEL_1;
+ if (has_component_restarted_max_times (component, component->su)) {
+ component->su->restart_control_state = SU_RC_IDLE_ESCALATION_LEVEL_2;
+@@ -1076,7 +1075,7 @@ static void su_rc_enter_idle_escalation_level_1 (amf_comp_t *component,
+ static void su_rc_enter_idle_escalation_level_2 (amf_comp_t *component,
+ SaAmfRecommendedRecoveryT recommended_recovery)
+ {
+- ENTER("");
++ ENTER();
+ component->su->restart_control_state = SU_RC_IDLE_ESCALATION_LEVEL_2;
+ amf_node_t *node = amf_node_find (&component->su->saAmfSUHostedByNode);
+ amf_node_comp_restart_req (node, component);
+@@ -1157,7 +1156,7 @@ int amf_su_instantiate (struct amf_su *su)
+ {
+ int is_instantiating = 1;
+
+- ENTER ("'%s %d'", su->name.value, su->saAmfSUPresenceState);
++ ENTER();
+ switch (su->saAmfSUPresenceState) {
+ case SA_AMF_PRESENCE_UNINSTANTIATED:
+ instantiate_all_components_in_level(su,
+@@ -1186,7 +1185,7 @@ int amf_su_instantiate (struct amf_su *su)
+ */
+ void amf_su_terminate (struct amf_su *su)
+ {
+- ENTER ("'%s'", su->name.value);
++ ENTER();
+ su->current_comp_instantiation_level = get_instantiation_max_level (su);
+
+ terminate_all_components_in_level (su, su->current_comp_instantiation_level);
+@@ -1203,8 +1202,7 @@ void amf_su_comp_error_suspected (
+ struct amf_comp *comp,
+ SaAmfRecommendedRecoveryT recommended_recovery)
+ {
+- ENTER ("Comp '%s', SU '%s' %d", comp->name.value, su->name.value,
+- su->restart_control_state);
++ ENTER();
+
+ switch (su->restart_control_state) {
+ case SU_RC_IDLE_ESCALATION_LEVEL_0:
+@@ -1268,7 +1266,7 @@ void amf_su_restart (struct amf_su *su)
+ {
+ SaNameT dn;
+
+- ENTER ("'%s'", su->name.value);
++ ENTER();
+
+ amf_su_dn_make (su, &dn);
+ log_printf (LOG_NOTICE, "Error detected for '%s', recovery "
+@@ -1316,7 +1314,7 @@ static void si_ha_state_assumed_cbfn (
+ struct amf_comp *comp;
+ struct amf_csi_assignment *csi_assignment;
+ int all_confirmed = 1;
+- ENTER ("");
++ ENTER();
+ tmp_si_assignment = amf_su_get_next_si_assignment(si_assignment->su, NULL);
+
+ while (tmp_si_assignment != NULL) {
+diff --git a/services/amfutil.c b/services/amfutil.c
+index a4bd9ec..ff8067b 100644
+--- a/services/amfutil.c
++++ b/services/amfutil.c
+@@ -1303,7 +1303,7 @@ int sa_amf_grep_one_sub_match(const char *string, char *pattern,
+
+ int i;
+
+- ENTER("'%s %s'",string, pattern);
++ ENTER();
+
+ if (regcomp(&re, pattern, REG_EXTENDED) != 0) {
+ status = 0;
+@@ -1345,7 +1345,7 @@ int sa_amf_grep(const char *string, char *pattern, size_t nmatch,
+
+ int i;
+
+- ENTER("'%s %s'",string, pattern);
++ ENTER();
+ if (regcomp(&re, pattern, REG_EXTENDED) != 0) {
+ status = 0;
+ goto out;
+@@ -1390,7 +1390,7 @@ int amf_msg_mcast (int msg_id, void *buf, size_t len)
+ int iov_cnt;
+ int res;
+
+-// ENTER ("%u, %p, %u", msg_id, buf, len);
++// ENTER();
+
+ msg.header.size = sizeof (msg);
+ msg.header.id = SERVICE_ID_MAKE (AMF_SERVICE, msg_id);
