| Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 1 | From 5e5686de677c884d5d785254412ced3c9d2d1b08 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 25 Jan 2023 21:47:45 -0800 |
| 4 | Subject: [PATCH 2/2] Fix -Werror=enum-int-mismatch with gcc13 |
| 5 | |
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 7 | --- |
| 8 | src/evt/agent/eda_hdl.h | 5 +++-- |
| 9 | src/evt/evtd/eds_mds.h | 3 +-- |
| 10 | src/smf/smfnd/smfnd.h | 8 ++++---- |
| 11 | 3 files changed, 8 insertions(+), 8 deletions(-) |
| 12 | |
| 13 | --- a/src/evt/agent/eda_hdl.h |
| 14 | +++ b/src/evt/agent/eda_hdl.h |
| 15 | @@ -31,6 +31,7 @@ |
| 16 | #define EVT_AGENT_EDA_HDL_H_ |
| 17 | |
| 18 | #include "evt/agent/eda.h" |
| 19 | +#include "ais/include/saAis.h" |
| 20 | |
| 21 | uint32_t eda_hdl_cbk_dispatch(EDA_CB *, EDA_CLIENT_HDL_REC *, SaDispatchFlagsT); |
| 22 | |
| 23 | @@ -68,11 +69,11 @@ EDA_CHANNEL_HDL_REC *eda_find_chan_hdl_r |
| 24 | |
| 25 | void eda_msg_destroy(EDSV_MSG *msg); |
| 26 | |
| 27 | -uint32_t eda_extract_pattern_from_event( |
| 28 | +SaAisErrorT eda_extract_pattern_from_event( |
| 29 | SaEvtEventPatternArrayT *from_pattern_array, |
| 30 | SaEvtEventPatternArrayT **to_pattern_array); |
| 31 | |
| 32 | -uint32_t eda_allocate_and_extract_pattern_from_event( |
| 33 | +SaAisErrorT eda_allocate_and_extract_pattern_from_event( |
| 34 | SaEvtEventPatternArrayT *from_pattern_array, |
| 35 | SaEvtEventPatternArrayT **to_pattern_array); |
| 36 | |
| 37 | --- a/src/evt/evtd/eds_mds.h |
| 38 | +++ b/src/evt/evtd/eds_mds.h |
| 39 | @@ -49,8 +49,7 @@ uint32_t eds_mds_msg_send(EDS_CB *cb, ED |
| 40 | MDS_SEND_PRIORITY_TYPE prio); |
| 41 | |
| 42 | uint32_t eds_mds_ack_send(EDS_CB *cb, EDSV_MSG *msg, MDS_DEST dest, |
| 43 | - SaTimeT timeout, MDS_SEND_PRIORITY_TYPE prio); |
| 44 | - |
| 45 | + SaTimeT timeout, uint32_t prio); |
| 46 | uint32_t eds_dec_subscribe_msg(NCS_UBAID *uba, long msg_hdl, uint8_t ckpt_flag); |
| 47 | |
| 48 | uint32_t eds_dec_publish_msg(NCS_UBAID *uba, long msg_hdl, uint8_t ckpt_flag); |
| 49 | --- a/src/smf/smfnd/smfnd.h |
| 50 | +++ b/src/smf/smfnd/smfnd.h |
| 51 | @@ -76,7 +76,7 @@ extern "C" { |
| 52 | #endif |
| 53 | |
| 54 | /* smfnd_amf.c */ |
| 55 | -extern uint32_t smfnd_amf_init(smfnd_cb_t *cb); |
| 56 | +extern SaAisErrorT smfnd_amf_init(smfnd_cb_t *cb); |
| 57 | |
| 58 | /* smfnd_mds.c */ |
| 59 | extern uint32_t smfnd_mds_init(smfnd_cb_t *cb); |