add inttypes format for i686 architectures

(cherry picked from commit feccfa6)

Author: razvancrainea

modules/cachedb_dynamodb/cachedb_dynamodb_dbase.c

@@ -19,6 +19,8 @@
  *
  */
 
+#include <inttypes.h>
+
 #include "cachedb_dynamodb_dbase.h"
 
 
@@ -304,7 +306,7 @@ int dynamodb_map_set(cachedb_con *connection, const str *key, const str *keyset,
 				LM_ERR("No more pkg mem\n");
 				return -1;
 			}
-			sprintf(attribute_value_int, "%ld", pair->val.val.i64);
+			sprintf(attribute_value_int, "%" PRId64, pair->val.val.i64);
 			init_str(&attribute_value, attribute_value_int);
 			break;
 

modules/emergency/post_curl.c

@@ -52,7 +52,7 @@ size_t write_data(char *ptr, size_t size, size_t nmemb, void *stream) {
 	data->size += (size * nmemb);
 
 #ifdef DEBUG
-	fprintf(stderr, "data at %p size=%ld nmemb=%ld\n", ptr, size, nmemb);
+	fprintf(stderr, "data at %p size=%zu nmemb=%zu\n", ptr, size, nmemb);
 #endif
 	tmp = realloc(data->data, data->size + 1); /* +1 for '\0' */
 

modules/http2d/server.c

@@ -584,7 +584,7 @@ static int on_request_recv(nghttp2_session *session,
 	rc = pthread_cond_timedwait(&ng_h2_response->cond,
 			&ng_h2_response->mutex, &wait_until);
 	diff_ns = get_clock_diff(&begin);
-	LM_DBG("waited %lld ns in total\n", diff_ns);
+	LM_DBG("waited %llu ns in total\n", diff_ns);
 	if (rc != 0) {
 		pthread_mutex_unlock(&ng_h2_response->mutex);
 
@@ -1049,4 +1049,3 @@ void http2_server(int rank)
 	run(int2str(h2_port, NULL), h2_tls_key.s, h2_tls_cert.s);
 	LM_ERR("HTTP2 server exiting!\n");
 }
-

modules/janus/ws_common.h

@@ -483,7 +483,7 @@ static int janus_connection_read_data(janus_connection *sock, struct janus_ws_re
 				size=req->tcp.pos-req->tcp.parsed;
 
 				if (size) {
-					LM_DBG("We still have %lu bytes, keeping connection \n", size);
+					LM_DBG("We still have %ld bytes, keeping connection \n", size);
 				}
 
 				if (handle_janus_json_request(sock, req->body) <0) {
@@ -613,7 +613,7 @@ static int janus_connection_handler_id(janus_connection *sock, struct janus_ws_r
 				size=req->tcp.pos-req->tcp.parsed;
 
 				if (size) {
-					LM_DBG("We still have %lu bytes, keeping connection \n", size);
+					LM_DBG("We still have %ld bytes, keeping connection \n", size);
 				}
 
 				if (populate_janus_handler_id(sock, req->body) <0) {

modules/lua/sipmysql.c

@@ -301,7 +301,7 @@ static int l_sipmysql_escape(lua_State *L)
   to = pkg_malloc(2 * len + 1);
   if (!to)
     {
-      siplua_log(L_CRIT, "malloc of %lu bytes failed\n", 2 * len + 1);
+      siplua_log(L_CRIT, "malloc of %zu bytes failed\n", 2 * len + 1);
       lua_pushnil(L);
       return 1;
     }
@@ -369,7 +369,7 @@ static int l_sipmysql_prepare(lua_State *L)
 	      o_stmt->bind = pkg_malloc(o_stmt->param_count * sizeof(MYSQL_BIND));
 	      if (!o_stmt->bind)
 		{
-		  siplua_log(L_CRIT, "malloc of %lu bytes failed\n",
+		  siplua_log(L_CRIT, "malloc of %zu bytes failed\n",
 			     o_stmt->param_count * sizeof(MYSQL_BIND));
 		  lua_remove(L, -1);
 		  lua_pushnil(L);
@@ -379,7 +379,7 @@ static int l_sipmysql_prepare(lua_State *L)
 	      o_stmt->is_null = pkg_malloc(o_stmt->param_count * sizeof(my_bool));
 	      if (!o_stmt->is_null)
 		{
-		  siplua_log(L_CRIT, "malloc of %lu bytes failed\n",
+		  siplua_log(L_CRIT, "malloc of %zu bytes failed\n",
 			     o_stmt->param_count * sizeof(my_bool));
 		  lua_remove(L, -1);
 		  lua_pushnil(L);
@@ -389,7 +389,7 @@ static int l_sipmysql_prepare(lua_State *L)
 	      o_stmt->length = pkg_malloc(o_stmt->param_count * sizeof(unsigned long));
 	      if (!o_stmt->length)
 		{
-		  siplua_log(L_CRIT, "malloc of %lu bytes failed\n",
+		  siplua_log(L_CRIT, "malloc of %zu bytes failed\n",
 			     o_stmt->param_count * sizeof(unsigned long));
 		  lua_remove(L, -1);
 		  lua_pushnil(L);
@@ -411,7 +411,7 @@ static int l_sipmysql_prepare(lua_State *L)
 	      o_stmt->result = pkg_malloc(o_stmt->num_fields * sizeof(MYSQL_BIND));
 	      if (!o_stmt->result)
 		{
-		  siplua_log(L_CRIT, "malloc of %lu bytes failed\n",
+		  siplua_log(L_CRIT, "malloc of %zu bytes failed\n",
 			     o_stmt->num_fields * sizeof(MYSQL_BIND));
 		  lua_remove(L, -1);
 		  lua_pushnil(L);
@@ -421,7 +421,7 @@ static int l_sipmysql_prepare(lua_State *L)
 	      o_stmt->real_length = pkg_malloc(o_stmt->num_fields * sizeof(unsigned long));
 	      if (!o_stmt->real_length)
 		{
-		  siplua_log(L_CRIT, "malloc of %lu bytes failed\n",
+		  siplua_log(L_CRIT, "malloc of %zu bytes failed\n",
 			     o_stmt->num_fields * sizeof(unsigned long));
 		  lua_remove(L, -1);
 		  lua_pushnil(L);
@@ -578,7 +578,7 @@ static int sipmysql_stmt_bind(struct sipmysql_stmt *o, lua_State *L, int n, int
 	o->bind[n].buffer = pkg_malloc(sizeof(number));
 	if (!o->bind[n].buffer)
 	  {
-	    siplua_log(L_CRIT, "malloc of %lu bytes failed\n", sizeof(number));
+	    siplua_log(L_CRIT, "malloc of %zu bytes failed\n", sizeof(number));
 	    lua_pushnil(L);
 	    return 1;
 	  }
@@ -597,7 +597,7 @@ static int sipmysql_stmt_bind(struct sipmysql_stmt *o, lua_State *L, int n, int
 	o->bind[n].buffer = pkg_malloc(len);
 	if (!o->bind[n].buffer)
 	  {
-	    siplua_log(L_CRIT, "malloc of %lu bytes failed\n", len);
+	    siplua_log(L_CRIT, "malloc of %zu bytes failed\n", len);
 	    lua_pushnil(L);
 	    return 1;
 	  }

modules/rest_client/rest_cb.c

@@ -43,7 +43,7 @@ size_t write_func(char *ptr, size_t size, size_t nmemb, void *body)
 	str *buff = (str *)body;
 
 #ifdef EXTRA_DEBUG
-	LM_DBG("got body piece! bs: %lu, blocks: %lu\n", size, nmemb);
+	LM_DBG("got body piece! bs: %zu, blocks: %zu\n", size, nmemb);
 #endif
 
 	if (len == 0)
@@ -108,4 +108,3 @@ size_t header_func(char *ptr, size_t size, size_t nmemb, void *userdata)
 
 	return len;
 }
-

modules/usrloc/ul_mi.c

@@ -32,6 +32,7 @@
 
 #include <string.h>
 #include <stdio.h>
+#include <inttypes.h>
 #include "../../mi/mi.h"
 #include "../../dprint.h"
 #include "../../ut.h"
@@ -115,7 +116,7 @@ static inline int mi_add_aor_node(mi_item_t *aor_item, urecord_t* r,
 		if (add_mi_string(ct_item, MI_SSTR("Contact"), c->c.s, c->c.len) < 0)
 			return -1;
 
-		if (add_mi_string_fmt(ct_item, MI_SSTR("ContactID"), "%lu", c->contact_id) < 0)
+		if (add_mi_string_fmt(ct_item, MI_SSTR("ContactID"), "%" PRIu64, c->contact_id) < 0)
 			return -1;
 
 		if (c->expires == 0) {