osaf/libs/core/mds/mds_dt_tipc.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
The following warning was fixed:
mds_dt_tipc.c: In function 'mdtm_tipc_init':
mds_dt_tipc.c:245:28: error: comparison of constant '2' with boolean expression
is always false [-Werror=bool-compare]
if (mds_use_network_order == NCSCC_RC_FAILURE) {
^
diff --git a/osaf/libs/core/mds/mds_dt_tipc.c b/osaf/libs/core/mds/mds_dt_tipc.c
--- a/osaf/libs/core/mds/mds_dt_tipc.c
+++ b/osaf/libs/core/mds/mds_dt_tipc.c
@@ -31,6 +31,7 @@
#include "ncssysf_tsk.h"
#include "ncssysf_mem.h"
+#include <stdbool.h>
#include <stdlib.h>
#include <sched.h>
#include <sys/poll.h>
@@ -57,7 +58,7 @@
*/
/* Following is defined for use by MDS in TIPC 2.0 as TIPC 2.0 supports only
network order */
-bool mds_use_network_order = 0;
+static bool mds_use_network_order = false;
#define NTOHL(x) (mds_use_network_order?ntohl(x):x)
#define HTONL(x) (mds_use_network_order?htonl(x):x)
@@ -240,9 +241,14 @@ uint32_t mdtm_tipc_init(NODE_ID nodeid,
return NCSCC_RC_FAILURE;
}
- mds_use_network_order = mdtm_tipc_check_for_endianness();
-
- if (mds_use_network_order == NCSCC_RC_FAILURE) {
+ switch (mdtm_tipc_check_for_endianness()) {
+ case 0:
+ mds_use_network_order = false;
+ break;
+ case 1:
+ mds_use_network_order = true;
+ break;
+ default:
close(tipc_cb.Dsock);
close(tipc_cb.BSRsock);
return NCSCC_RC_FAILURE;
------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
