osaf/services/saf/avsv/avnd/avnd_tmr.c | 10 +++++----- osaf/services/saf/avsv/avnd/include/avnd_tmr.h | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-)
structs need to be explicitly declared 'struct' in C. diff --git a/osaf/services/saf/avsv/avnd/avnd_tmr.c b/osaf/services/saf/avsv/avnd/avnd_tmr.c --- a/osaf/services/saf/avsv/avnd/avnd_tmr.c +++ b/osaf/services/saf/avsv/avnd/avnd_tmr.c @@ -211,7 +211,7 @@ uint32_t tmr_comp_err_esc_start(AVND_CB return rc; } -void tmr_comp_err_esc_stop(avnd_cb_tag *cb, avnd_su_tag *su) +void tmr_comp_err_esc_stop(AVND_CB *cb, AVND_SU *su) { LOG_NO("'%s' component restart probation timer stopped", su->name.value); @@ -219,7 +219,7 @@ void tmr_comp_err_esc_stop(avnd_cb_tag * avnd_stop_tmr(cb, &su->su_err_esc_tmr); } -uint32_t tmr_su_err_esc_start(avnd_cb_tag *cb, avnd_su_tag *su) +uint32_t tmr_su_err_esc_start(AVND_CB *cb, AVND_SU *su) { uint32_t rc; @@ -236,7 +236,7 @@ uint32_t tmr_su_err_esc_start(avnd_cb_ta return rc; } -void tmr_su_err_esc_stop(avnd_cb_tag *cb, avnd_su_tag *su) +void tmr_su_err_esc_stop(AVND_CB *cb, AVND_SU *su) { LOG_NO("'%s' SU restart probation timer stopped", su->name.value); @@ -244,7 +244,7 @@ void tmr_su_err_esc_stop(avnd_cb_tag *cb avnd_stop_tmr(cb, &su->su_err_esc_tmr); } -uint32_t tmr_node_err_esc_start(avnd_cb_tag *cb) +uint32_t tmr_node_err_esc_start(AVND_CB *cb) { uint32_t rc; @@ -260,7 +260,7 @@ uint32_t tmr_node_err_esc_start(avnd_cb_ return rc; } -void tmr_node_err_esc_stop(avnd_cb_tag *cb) +void tmr_node_err_esc_stop(AVND_CB *cb) { LOG_NO("SU failover probation timer stopped"); diff --git a/osaf/services/saf/avsv/avnd/include/avnd_tmr.h b/osaf/services/saf/avsv/avnd/include/avnd_tmr.h --- a/osaf/services/saf/avsv/avnd/include/avnd_tmr.h +++ b/osaf/services/saf/avsv/avnd/include/avnd_tmr.h @@ -123,22 +123,22 @@ typedef struct avnd_tmr { avnd_stop_tmr((cb), &(rec).resp_tmr); /* start the component-error-escalation timer */ -uint32_t tmr_comp_err_esc_start(avnd_cb_tag *cb, avnd_su_tag *su); +uint32_t tmr_comp_err_esc_start(struct avnd_cb_tag *cb, struct avnd_su_tag *su); /* stop the component-error-escalation timer */ -void tmr_comp_err_esc_stop(avnd_cb_tag *cb, avnd_su_tag *su); +void tmr_comp_err_esc_stop(struct avnd_cb_tag *cb, struct avnd_su_tag *su); /* start the su-error-escalation timer */ -uint32_t tmr_su_err_esc_start(avnd_cb_tag *cb, avnd_su_tag *su); +uint32_t tmr_su_err_esc_start(struct avnd_cb_tag *cb, struct avnd_su_tag *su); /* stop the su-error-escalation timer */ -void tmr_su_err_esc_stop(avnd_cb_tag *cb, avnd_su_tag *su); +void tmr_su_err_esc_stop(struct avnd_cb_tag *cb, struct avnd_su_tag *su); /* start the node-error-escalation timer */ -uint32_t tmr_node_err_esc_start(avnd_cb_tag *cb); +uint32_t tmr_node_err_esc_start(struct avnd_cb_tag *cb); /* stop the node-error-escalation timer */ -void tmr_node_err_esc_stop(avnd_cb_tag *cb); +void tmr_node_err_esc_stop(struct avnd_cb_tag *cb); /* Macro to start the proxied comp-inst timer */ #define m_AVND_TMR_PXIED_COMP_INST_START(cb, comp, rc) \ ------------------------------------------------------------------------------ _______________________________________________ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel