Changeset 1027:0117a7746b21 in freeDiameter for libfdproto/messages.c

Timestamp:

Apr 15, 2013, 4:17:07 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Fix a number of errors and warnings introduced/highlighted by recent commits

File:

• libfdproto/messages.c (modified) (9 diffs)

libfdproto/messages.c

@@ -1517 +1517 @@
 static int bufferize_msg(unsigned char * buffer, size_t buflen, size_t * offset, struct msg * msg)
 {
-        TRACE_ENTRY("%p %d %p %p", buffer, buflen, offset, msg);
+        TRACE_ENTRY("%p %zd %p %p", buffer, buflen, offset, msg);
         
         if ((buflen - *offset) < GETMSGHDRSZ())
@@ -1552 +1552 @@
         struct dict_avp_data dictdata;
         
-        TRACE_ENTRY("%p %d %p %p", buffer, buflen, offset, avp);
+        TRACE_ENTRY("%p %zd %p %p", buffer, buflen, offset, avp);
         
         if ((buflen - *offset) < avp->avp_public.avp_len)
@@ -1649 +1649 @@
         struct fd_list * avpch;
         
-        TRACE_ENTRY("%p %d %p %p", buffer, buflen, offset, list);
+        TRACE_ENTRY("%p %zd %p %p", buffer, buflen, offset, list);
         
         for (avpch = list->next; avpch != list; avpch = avpch->next) {
@@ -1712 +1712 @@
         size_t offset = 0;
         
-        TRACE_ENTRY("%p %d %p", buf, buflen, head);
+        TRACE_ENTRY("%p %zd %p", buf, buflen, head);
         
         while (offset < buflen) {
@@ -1718 +1718 @@
                 
                 if (buflen - offset < AVPHDRSZ_NOVEND) {
-                        TRACE_DEBUG(INFO, "truncated buffer: remaining only %d bytes", buflen - offset);
+                        TRACE_DEBUG(INFO, "truncated buffer: remaining only %zd bytes", buflen - offset);
                         return EBADMSG;
                 }
@@ -1736 +1736 @@
                 if (avp->avp_public.avp_flags & AVP_FLAG_VENDOR) {
                         if (buflen - offset < 4) {
-                                TRACE_DEBUG(INFO, "truncated buffer: remaining only %d bytes for vendor and data", buflen - offset);
+                                TRACE_DEBUG(INFO, "truncated buffer: remaining only %zd bytes for vendor and data", buflen - offset);
                                 free(avp);
                                 return EBADMSG;
@@ -1747 +1747 @@
                 if ( (avp->avp_public.avp_len > GETAVPHDRSZ(avp->avp_public.avp_flags))
                 && (buflen - offset < avp->avp_public.avp_len - GETAVPHDRSZ(avp->avp_public.avp_flags))) {
-                        TRACE_DEBUG(INFO, "truncated buffer: remaining only %d bytes for data, and avp data size is %d", 
+                        TRACE_DEBUG(INFO, "truncated buffer: remaining only %zd bytes for data, and avp data size is %d", 
                                         buflen - offset, 
                                         avp->avp_public.avp_len - GETAVPHDRSZ(avp->avp_public.avp_flags));
@@ -1775 +1775 @@
         unsigned char * buf;
         
-        TRACE_ENTRY("%p %d %p", buffer, buflen, msg);
+        TRACE_ENTRY("%p %zd %p", buffer, buflen, msg);
         
         CHECK_PARAMS(  buffer &&  *buffer  &&  msg  &&  (buflen >= GETMSGHDRSZ())  );
@@ -1789 +1789 @@
         msglen = ntohl(*(uint32_t *)buf) & 0x00ffffff;
         if ( buflen < msglen ) {  
-                TRACE_DEBUG(INFO, "Truncated message (%d / %d)", buflen, msglen );
+                TRACE_DEBUG(INFO, "Truncated message (%zd / %d)", buflen, msglen );
                 free(buf);
                 return EBADMSG;