fix gcc 5.2 warnings

OpenSIPS · Aug 24, 2015 · d2c08e9 · d2c08e9
1 parent d13c844
commit d2c08e9
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 11 deletions.
diff --git a/modules/cachedb_redis/cachedb_redis_utils.c b/modules/cachedb_redis/cachedb_redis_utils.c
@@ -83,7 +83,7 @@ unsigned int redisHash(redis_con *con, str* key)
 	return crc16(key->s,key->len) & con->slots_assigned;
 }
 
-inline cluster_node *get_redis_connection(redis_con *con,str *key)
+cluster_node *get_redis_connection(redis_con *con,str *key)
 {
 	unsigned short hash_slot;
 	cluster_node *it;

diff --git a/modules/cachedb_redis/cachedb_redis_utils.h b/modules/cachedb_redis/cachedb_redis_utils.h
@@ -29,7 +29,7 @@
 #include "cachedb_redis_dbase.h"
 
 int build_cluster_nodes(redis_con *con,char *info,int size);
-extern inline cluster_node *get_redis_connection(redis_con *con,str *key);
+cluster_node *get_redis_connection(redis_con *con,str *key);
 void destroy_cluster_nodes(redis_con *con);
 
 #endif
diff --git a/modules/compression/compression_helpers.c b/modules/compression/compression_helpers.c
@@ -407,7 +407,7 @@ int free_hdr_mask(struct hdr_field** hdr_mask)
 	return 0;
 }
 
-inline int check_zlib_rc(int rc)
+int check_zlib_rc(int rc)
 {
 	switch (rc) {
 		case Z_OK:
@@ -431,7 +431,7 @@ inline int check_zlib_rc(int rc)
 	}
 }
 
-inline int wrap_realloc(str* buf, int new_len)
+int wrap_realloc(str* buf, int new_len)
 {
 	if (buf->s==NULL) {
 		buf->s = pkg_malloc(new_len);

diff --git a/modules/compression/compression_helpers.h b/modules/compression/compression_helpers.h
@@ -41,6 +41,6 @@ int fixup_compression_flags(void**);
 int free_whitelist(mc_whitelist_p* whitelist);
 int free_hdr_list(struct hdr_field** hdr_lst_p);
 int free_hdr_mask(struct hdr_field** hdr_mask);
-extern inline int check_zlib_rc(int rc);
-extern inline int wrap_realloc(str* buf, int new_len);
+int check_zlib_rc(int rc);
+int wrap_realloc(str* buf, int new_len);
 #endif
diff --git a/modules/db_berkeley/bdb_val.c b/modules/db_berkeley/bdb_val.c
@@ -45,7 +45,7 @@
  * should be done in the val2str function, as some databases
  * like db_berkeley don't need or like this at all.
  */
-inline int bdb_time2str(time_t _v, char* _s, int* _l)
+static inline int bdb_time2str(time_t _v, char* _s, int* _l)
 {
 	struct tm* t;
 	int l;

diff --git a/modules/db_perlvdb/perlvdbfunc.c b/modules/db_perlvdb/perlvdbfunc.c
@@ -36,7 +36,7 @@
  * including decreasing ref cnt
  */
 
-inline long IV2int(SV *in) {
+static inline long IV2int(SV *in) {
 	int ret = -1;
 
 	if (SvOK(in)) {

diff --git a/modules/perl/opensipsxs.xs b/modules/perl/opensipsxs.xs
@@ -399,7 +399,7 @@ char *pv_sprintf(struct sip_msg *m, char *fmt) {
  * - strflag: flag mask to be or-applied for string match
  */
 
-inline int sv2int_str(SV *val, int_str *is,
+static inline int sv2int_str(SV *val, int_str *is,
 		      unsigned short *flags, unsigned short strflag) {
 	char *s;
 	STRLEN len;

diff --git a/modules/perl/perl.c b/modules/perl/perl.c
@@ -311,6 +311,9 @@ struct mi_root* perl_mi_reload(struct mi_root *cmd_tree, void *param)
 static int mod_init(void) {
 
 	int ret = 0;
+	static int argc = 1;
+	static char *argv_name = "opensips";
+	static char **argv = { &argv_name };
 
 	LM_INFO("initializing...\n");
 
@@ -330,7 +333,7 @@ static int mod_init(void) {
 		return -1;
 	}
 
-	PERL_SYS_INIT3(NULL, NULL, &environ);
+	PERL_SYS_INIT3(&argc, &argv, &environ);
 
 	if ((my_perl = parser_init())) {
 		ret = 0;

diff --git a/modules/presence/publish.c b/modules/presence/publish.c
@@ -117,7 +117,7 @@ static inline void presence_raise_event(presentity_t* presentity)
 }
 
 
-void inline build_extra_hdrs(struct sip_msg* msg, const str* map, str* extra_hdrs)
+static inline void build_extra_hdrs(struct sip_msg* msg, const str* map, str* extra_hdrs)
 {
 	struct hdr_field *hf;
 	str xtra_hdr_list[MAX_NO_OF_EXTRA_HDRS];