summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/mgmt_be_client.c9
-rw-r--r--lib/mgmt_fe_client.c9
-rw-r--r--lib/mgmt_msg.c4
-rw-r--r--mgmtd/mgmt_be_adapter.c9
-rw-r--r--mgmtd/mgmt_fe_adapter.c16
-rw-r--r--mgmtd/mgmt_txn.c5
6 files changed, 29 insertions, 23 deletions
diff --git a/lib/mgmt_be_client.c b/lib/mgmt_be_client.c
index 4dc7b296b8..bb45024d0e 100644
--- a/lib/mgmt_be_client.c
+++ b/lib/mgmt_be_client.c
@@ -819,7 +819,11 @@ static int
mgmt_be_client_handle_msg(struct mgmt_be_client_ctx *client_ctx,
Mgmtd__BeMessage *be_msg)
{
- switch (be_msg->message_case) {
+ /*
+ * protobuf-c adds a max size enum with an internal, and changing by
+ * version, name; cast to an int to avoid unhandled enum warnings
+ */
+ switch ((int)be_msg->message_case) {
case MGMTD__BE_MESSAGE__MESSAGE_SUBSCR_REPLY:
MGMTD_BE_CLIENT_DBG("Subscribe Reply Msg from mgmt, status %u",
be_msg->subscr_reply->success);
@@ -861,9 +865,6 @@ mgmt_be_client_handle_msg(struct mgmt_be_client_ctx *client_ctx,
case MGMTD__BE_MESSAGE__MESSAGE_SHOW_CMD_REPLY:
case MGMTD__BE_MESSAGE__MESSAGE_NOTIFY_DATA:
case MGMTD__BE_MESSAGE__MESSAGE__NOT_SET:
-#if PROTOBUF_C_VERSION_NUMBER >= 1003000
- case _MGMTD__BE_MESSAGE__MESSAGE_IS_INT_SIZE:
-#endif
default:
/*
* A 'default' case is being added contrary to the
diff --git a/lib/mgmt_fe_client.c b/lib/mgmt_fe_client.c
index 73154401ec..3624922124 100644
--- a/lib/mgmt_fe_client.c
+++ b/lib/mgmt_fe_client.c
@@ -428,7 +428,11 @@ mgmt_fe_client_handle_msg(struct mgmt_fe_client_ctx *client_ctx,
{
struct mgmt_fe_client_session *session = NULL;
- switch (fe_msg->message_case) {
+ /*
+ * protobuf-c adds a max size enum with an internal, and changing by
+ * version, name; cast to an int to avoid unhandled enum warnings
+ */
+ switch ((int)fe_msg->message_case) {
case MGMTD__FE_MESSAGE__MESSAGE_SESSION_REPLY:
if (fe_msg->session_reply->create
&& fe_msg->session_reply->has_client_conn_id) {
@@ -634,9 +638,6 @@ mgmt_fe_client_handle_msg(struct mgmt_fe_client_ctx *client_ctx,
case MGMTD__FE_MESSAGE__MESSAGE_GETCFG_REQ:
case MGMTD__FE_MESSAGE__MESSAGE_GETDATA_REQ:
case MGMTD__FE_MESSAGE__MESSAGE__NOT_SET:
-#if PROTOBUF_C_VERSION_NUMBER >= 1003000
- case _MGMTD__FE_MESSAGE__MESSAGE_IS_INT_SIZE:
-#endif
default:
/*
* A 'default' case is being added contrary to the
diff --git a/lib/mgmt_msg.c b/lib/mgmt_msg.c
index d212fef92c..2fab03bc54 100644
--- a/lib/mgmt_msg.c
+++ b/lib/mgmt_msg.c
@@ -56,7 +56,7 @@ enum mgmt_msg_rsched mgmt_msg_read(struct mgmt_msg_state *ms, int fd,
*/
while (avail > sizeof(struct mgmt_msg_hdr)) {
n = stream_read_try(ms->ins, fd, avail);
- MGMT_MSG_DBG(dbgtag, "got %ld bytes", n);
+ MGMT_MSG_DBG(dbgtag, "got %zd bytes", n);
/* -2 is normal nothing read, and to retry */
if (n == -2)
@@ -85,7 +85,7 @@ enum mgmt_msg_rsched mgmt_msg_read(struct mgmt_msg_state *ms, int fd,
MGMT_MSG_DBG(dbgtag, "recv corrupt buffer, disconnect");
return MSR_DISCONNECT;
}
- if (mhdr->len > left)
+ if ((ssize_t)mhdr->len > left)
break;
MGMT_MSG_DBG(dbgtag, "read full message len %u", mhdr->len);
diff --git a/mgmtd/mgmt_be_adapter.c b/mgmtd/mgmt_be_adapter.c
index c57fa081a9..2957b2908f 100644
--- a/mgmtd/mgmt_be_adapter.c
+++ b/mgmtd/mgmt_be_adapter.c
@@ -364,7 +364,11 @@ static int
mgmt_be_adapter_handle_msg(struct mgmt_be_client_adapter *adapter,
Mgmtd__BeMessage *be_msg)
{
- switch (be_msg->message_case) {
+ /*
+ * protobuf-c adds a max size enum with an internal, and changing by
+ * version, name; cast to an int to avoid unhandled enum warnings
+ */
+ switch ((int)be_msg->message_case) {
case MGMTD__BE_MESSAGE__MESSAGE_SUBSCR_REQ:
MGMTD_BE_ADAPTER_DBG(
"Got Subscribe Req Msg from '%s' to %sregister %u xpaths",
@@ -470,9 +474,6 @@ mgmt_be_adapter_handle_msg(struct mgmt_be_client_adapter *adapter,
case MGMTD__BE_MESSAGE__MESSAGE_CFG_CMD_REQ:
case MGMTD__BE_MESSAGE__MESSAGE_SHOW_CMD_REQ:
case MGMTD__BE_MESSAGE__MESSAGE__NOT_SET:
-#if PROTOBUF_C_VERSION_NUMBER >= 1003000
- case _MGMTD__BE_MESSAGE__MESSAGE_IS_INT_SIZE:
-#endif
default:
/*
* A 'default' case is being added contrary to the
diff --git a/mgmtd/mgmt_fe_adapter.c b/mgmtd/mgmt_fe_adapter.c
index d45630478b..6b4f09d9b2 100644
--- a/mgmtd/mgmt_fe_adapter.c
+++ b/mgmtd/mgmt_fe_adapter.c
@@ -1222,9 +1222,10 @@ static int mgmt_fe_session_handle_commit_config_req_msg(
"Failed to create a Configuration session!");
return 0;
}
- MGMTD_FE_ADAPTER_DBG(
- "Created txn %llu for session %llu for COMMIT-CFG-REQ",
- session->cfg_txn_id, session->session_id);
+ MGMTD_FE_ADAPTER_DBG("Created txn %" PRIu64
+ " for session %" PRIu64
+ " for COMMIT-CFG-REQ",
+ session->cfg_txn_id, session->session_id);
}
@@ -1273,7 +1274,11 @@ mgmt_fe_adapter_handle_msg(struct mgmt_fe_client_adapter *adapter,
{
struct mgmt_fe_session_ctx *session;
- switch (fe_msg->message_case) {
+ /*
+ * protobuf-c adds a max size enum with an internal, and changing by
+ * version, name; cast to an int to avoid unhandled enum warnings
+ */
+ switch ((int)fe_msg->message_case) {
case MGMTD__FE_MESSAGE__MESSAGE_REGISTER_REQ:
MGMTD_FE_ADAPTER_DBG("Got Register Req Msg from '%s'",
fe_msg->register_req->client_name);
@@ -1397,9 +1402,6 @@ mgmt_fe_adapter_handle_msg(struct mgmt_fe_client_adapter *adapter,
case MGMTD__FE_MESSAGE__MESSAGE_GETCFG_REPLY:
case MGMTD__FE_MESSAGE__MESSAGE_GETDATA_REPLY:
case MGMTD__FE_MESSAGE__MESSAGE__NOT_SET:
-#if PROTOBUF_C_VERSION_NUMBER >= 1003000
- case _MGMTD__FE_MESSAGE__MESSAGE_IS_INT_SIZE:
-#endif
default:
/*
* A 'default' case is being added contrary to the
diff --git a/mgmtd/mgmt_txn.c b/mgmtd/mgmt_txn.c
index 3a3043421b..7ae720bc5f 100644
--- a/mgmtd/mgmt_txn.c
+++ b/mgmtd/mgmt_txn.c
@@ -2476,7 +2476,8 @@ int mgmt_txn_notify_be_adapter_conn(struct mgmt_be_client_adapter *adapter,
return -1;
}
- MGMTD_TXN_DBG("Created initial txn %llu for BE connection %s",
+ MGMTD_TXN_DBG("Created initial txn %" PRIu64
+ " for BE connection %s",
txn->txn_id, adapter->name);
/*
* Set the changeset for transaction to commit and trigger the
@@ -2815,7 +2816,7 @@ int mgmt_txn_rollback_trigger_cfg_apply(struct mgmt_ds_ctx *src_ds_ctx,
return -1;
}
- MGMTD_TXN_DBG("Created rollback txn %llu", txn->txn_id);
+ MGMTD_TXN_DBG("Created rollback txn %" PRIu64, txn->txn_id);
/*
* Set the changeset for transaction to commit and trigger the commit