Changeset 1284:38e4a7c318ac in freeDiameter

Timestamp:

Jan 4, 2015, 1:55:57 AM (9 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Fix a number of compilation warnings

Files:

• extensions/rt_busypeers/rtbusy.c (modified) (2 diffs)
• extensions/rt_ignore_dh/rt_ignore_dh.c (modified) (1 diff)
• extensions/rt_load_balance/rt_load_balance.c (modified) (1 diff)
• extensions/rt_randomize/rt_randomize.c (modified) (2 diffs)
• libfdcore/CMakeLists.txt (modified) (1 diff)
• libfdproto/CMakeLists.txt (modified) (1 diff)
• libfdproto/dictionary_functions.c (modified) (1 diff)

extensions/rt_busypeers/rtbusy.c

@@ -114 +114 @@
                         expire.tv_nsec = (expire.tv_nsec + (1000000LL * (rtbusy_conf.RelayTimeout % 1000))) % 1000000000LL;
                         CHECK_MALLOC_DO( fd_msg_dump_full(&buf, &len, NULL, *pmsg, fd_g_config->cnf_dict, 0, 1), /* nothing */);
-                        TRACE_ERROR( "No answer received for message from peer '%.*s' before timeout (%dms), re-sending: %s", senttolen, sentto,
+                        TRACE_ERROR( "No answer received for message from peer '%.*s' before timeout (%dms), re-sending: %s", (int)senttolen, sentto,
                                      rtbusy_conf.RelayTimeout, buf);
                         free(buf);
@@ -128 +128 @@
 
                         CHECK_MALLOC_DO( fd_msg_dump_full(&buf, &len, NULL, *pmsg, fd_g_config->cnf_dict, 0, 1), /* nothing */);
-                        TRACE_ERROR( "No answer received for message from peer '%.*s' before timeout (%dms), giving up and sending error reply: %s", senttolen, sentto,
+                        TRACE_ERROR( "No answer received for message from peer '%.*s' before timeout (%dms), giving up and sending error reply: %s", (int)senttolen, sentto,
                                      rtbusy_conf.RelayTimeout, buf);
                         free(buf);

extensions/rt_ignore_dh/rt_ignore_dh.c

@@ -138 +138 @@
                         CHECK_FCT(fd_msg_avp_new(ph_avp_do, 0, &ph_avp));
                         memset(&val, 0, sizeof(val));
-                        val.os.data = fd_g_config->cnf_diamid;
+                        val.os.data = (uint8_t *)(fd_g_config->cnf_diamid);
                         val.os.len = fd_g_config->cnf_diamid_len;
                         CHECK_FCT(fd_msg_avp_setvalue(ph_avp, &val));

extensions/rt_load_balance/rt_load_balance.c

@@ -69 +69 @@
                     load /= 2;
                 }
+                score = cand->score;
                 cand->score -= load_log;
                 TRACE_DEBUG(FULL, "evaluated peer `%.*s', score was %d, now %d", (int)cand->diamidlen, cand->diamid, score, cand->score);

extensions/rt_randomize/rt_randomize.c

@@ -39 +39 @@
 #include <stdlib.h>
 
-static int seed;
+static unsigned int seed;
 
 static int rt_randomizing(void * cbdata, struct msg ** pmsg, struct fd_list * candidates)
@@ -96 +96 @@
         /* Register the callback */
         CHECK_FCT(fd_rt_out_register(rt_randomizing, NULL, 4, &rt_randomizing_hdl));
-        seed = (int)time(NULL);
+        seed = (unsigned int)time(NULL);
         TRACE_DEBUG(INFO, "Extension 'Randomizing' initialized");
         return 0;

libfdcore/CMakeLists.txt

@@ -1 +1 @@
 # The subproject name
 Project("freeDiameter core library" C)
+
+# Configuration for newer cmake
+cmake_policy(SET CMP0022 OLD)
 
 # Configuration parser

libfdproto/CMakeLists.txt

@@ -2 +2 @@
 Project("libfdproto" C)
 
+# Configuration for newer cmake
+cmake_policy(SET CMP0022 OLD)
 
 # List of source files for the library

libfdproto/dictionary_functions.c

@@ -203 +203 @@
                 case 8:
                         /* E.164 */
-                        CHECK_MALLOC_DO( fd_dump_extend(FD_DUMP_STD_PARAMS, "%.*s", avp_value->os.len-2, avp_value->os.data+2), return NULL);
+                        CHECK_MALLOC_DO( fd_dump_extend(FD_DUMP_STD_PARAMS, "%.*s", (int)(avp_value->os.len-2), avp_value->os.data+2), return NULL);
                         return *buf;
                 default: