Changeset 27:b3a1773e9f46 in freeDiameter

Timestamp:

Oct 26, 2009, 4:48:47 PM (15 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

again, correct was actually %zd

Location:

freeDiameter

Files:

• cnxctx.c (modified) (4 diffs)
• p_psm.c (modified) (1 diff)
• sctp.c (modified) (2 diffs)
• sctps.c (modified) (2 diffs)
• server.c (modified) (1 diff)

freeDiameter/cnxctx.c

@@ -504 +504 @@
                    || (length > DIAMETER_MSG_SIZE_MAX)) { /* to avoid too big mallocs */
                         /* The message is suspect */
-                        TRACE_DEBUG(INFO, "Received suspect header [ver: %d, size: %z], assume disconnection", (int)header[0], length);
+                        TRACE_DEBUG(INFO, "Received suspect header [ver: %d, size: %zd], assume disconnection", (int)header[0], length);
                         goto error; /* Stop the thread, the recipient of the event will cleanup */
                 }
@@ -630 +630 @@
                    || (length > DIAMETER_MSG_SIZE_MAX)) { /* to avoid too big mallocs */
                         /* The message is suspect */
-                        TRACE_DEBUG(INFO, "Received suspect header [ver: %d, size: %z], assume disconnection", (int)header[0], length);
+                        TRACE_DEBUG(INFO, "Received suspect header [ver: %d, size: %zd], assume disconnection", (int)header[0], length);
                         goto out;
                 }
@@ -895 +895 @@
         ssize_t ret;
         size_t sent = 0;
-        TRACE_ENTRY("%p %p %z", conn, buf, len);
+        TRACE_ENTRY("%p %p %zd", conn, buf, len);
         do {
                 if (conn->cc_tls) {
@@ -910 +910 @@
 int fd_cnx_send(struct cnxctx * conn, unsigned char * buf, size_t len)
 {
-        TRACE_ENTRY("%p %p %z", conn, buf, len);
+        TRACE_ENTRY("%p %p %zd", conn, buf, len);
         
         CHECK_PARAMS(conn && (conn->cc_socket > 0) && buf && len);
 
-        TRACE_DEBUG(FULL, "Sending %zb %sdata on connection %s", len, conn->cc_tls ? "TLS-protected ":"", conn->cc_id);
+        TRACE_DEBUG(FULL, "Sending %zdb %sdata on connection %s", len, conn->cc_tls ? "TLS-protected ":"", conn->cc_id);
         
         switch (conn->cc_proto) {

freeDiameter/p_psm.c

@@ -164 +164 @@
         /* Get next event */
         CHECK_FCT_DO( fd_event_timedget(peer->p_events, &peer->p_psm_timer, FDEVP_PSM_TIMEOUT, &event, &ev_sz, &ev_data), goto psm_end );
-        TRACE_DEBUG(FULL, "'%s'\t<-- '%s'\t(%p,%z)\t'%s'",
+        TRACE_DEBUG(FULL, "'%s'\t<-- '%s'\t(%p,%zd)\t'%s'",
                         STATE_STR(peer->p_hdr.info.pi_state),
                         fd_pev_str(event), ev_data, ev_sz,

freeDiameter/sctp.c

@@ -764 +764 @@
         if (sz != sizeof(status))
         {
-                TRACE_DEBUG(INFO, "Invalid size of socket option: %d / %z", sz, sizeof(status));
+                TRACE_DEBUG(INFO, "Invalid size of socket option: %d / %zd", sz, sizeof(status));
                 return ENOTSUP;
         }
@@ -911 +911 @@
         ssize_t ret;
         
-        TRACE_ENTRY("%d %hu %p %z", sock, strid, buf, len);
+        TRACE_ENTRY("%d %hu %p %zd", sock, strid, buf, len);
         
         memset(&mhdr, 0, sizeof(mhdr));

freeDiameter/sctps.c

@@ -136 +136 @@
         struct sctps_ctx * ctx = (struct sctps_ctx *) tr;
         
-        TRACE_ENTRY("%p %p %z", tr, data, len);
+        TRACE_ENTRY("%p %p %zd", tr, data, len);
         CHECK_PARAMS_DO( tr && data, { errno = EINVAL; return -1; } );
         
@@ -151 +151 @@
         int emptied;
         
-        TRACE_ENTRY("%p %p %z", tr, buf, len);
+        TRACE_ENTRY("%p %p %zd", tr, buf, len);
         CHECK_PARAMS_DO( tr && buf, { errno = EINVAL; return -1; } );
         

freeDiameter/server.c

@@ -134 +134 @@
         CHECK_FCT_DO( fd_cnx_receive(c->conn, &c->ts, &buf, &bufsz), goto cleanup );
         
-        TRACE_DEBUG(FULL, "Received %zb from new client '%s'", bufsz, fd_cnx_getid(c->conn));
+        TRACE_DEBUG(FULL, "Received %zdb from new client '%s'", bufsz, fd_cnx_getid(c->conn));
         
         /* Try parsing this message */