[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37143 - gnunet/src/social
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37143 - gnunet/src/social |
Date: |
Fri, 6 May 2016 19:45:30 +0200 |
Author: tg
Date: 2016-05-06 19:45:30 +0200 (Fri, 06 May 2016)
New Revision: 37143
Modified:
gnunet/src/social/gnunet-service-social.c
gnunet/src/social/test_social.c
Log:
social: fix compiler warnings
Modified: gnunet/src/social/gnunet-service-social.c
===================================================================
--- gnunet/src/social/gnunet-service-social.c 2016-05-06 15:25:44 UTC (rev
37142)
+++ gnunet/src/social/gnunet-service-social.c 2016-05-06 17:45:30 UTC (rev
37143)
@@ -1308,7 +1308,7 @@
{
GNUNET_break (0);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Error removing app place file: %s: %s\n",
+ "Error removing app place file: %s: %s (%d)\n",
app_place_filename, strerror (errno), errno);
ret = GNUNET_SYSERR;
}
@@ -1641,7 +1641,7 @@
if (0 != remaining)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "%u + %u + %u != %u\n",
+ "%zu + %u + %u != %u\n",
sizeof (*greq), relay_size, join_msg_size, greq_size);
GNUNET_break (0);
GNUNET_free (gst);
@@ -2656,9 +2656,9 @@
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"%p psyc_transmit_queue_next_method: invalid method name.\n",
- plc, ntohs (pmsg->type));
+ plc);
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "%u <= %u || NUL != %u\n",
+ "%zu <= %u || NUL != %u\n",
sizeof (*pmeth), psize, *((char *) pmeth + psize - 1));
GNUNET_break (0);
GNUNET_free (pmeth);
@@ -2924,7 +2924,8 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p History replay #%" PRIu64 ": "
"PSYCstore returned %" PRId64 " (%.*s)\n",
- opcls->plc, GNUNET_ntohll (opcls->op_id), result, err_msg_size,
err_msg);
+ opcls->plc, GNUNET_ntohll (opcls->op_id), result,
+ err_msg_size, (const char *) err_msg);
// FIXME: place might have been destroyed
client_send_result (opcls->client, opcls->op_id, result, err_msg,
err_msg_size);
@@ -2953,7 +2954,7 @@
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"%p History replay #%" PRIu64 ": "
- "invalid method prefix. size: %u < %u?\n",
+ "invalid method prefix. size: %u < %zu?\n",
plc, GNUNET_ntohll (req->op_id), size, sizeof (*req) + 1);
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
@@ -3029,7 +3030,8 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p State get #%" PRIu64 ": "
"PSYCstore returned %" PRId64 " (%.*s)\n",
- opcls->plc, GNUNET_ntohll (opcls->op_id), result, err_msg_size,
err_msg);
+ opcls->plc, GNUNET_ntohll (opcls->op_id), result,
+ err_msg_size, (const char *) err_msg);
// FIXME: place might have been destroyed
client_send_result (opcls->client, opcls->op_id, result, err_msg,
err_msg_size);
@@ -3062,7 +3064,7 @@
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"%p State get #%" PRIu64 ": "
- "invalid name. size: %u < %u?\n",
+ "invalid name. size: %u < %zu?\n",
plc, GNUNET_ntohll (req->op_id), size, sizeof (*req) + 1);
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
Modified: gnunet/src/social/test_social.c
===================================================================
--- gnunet/src/social/test_social.c 2016-05-06 15:25:44 UTC (rev 37142)
+++ gnunet/src/social/test_social.c 2016-05-06 17:45:30 UTC (rev 37143)
@@ -510,8 +510,8 @@
const void *data, uint16_t data_size)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Test #%u: Zone add place result: %d (%.*s).\n",
- test, result, data_size, data);
+ "Test #%u: Zone add place result: %" PRId64 " (%.*s).\n",
+ test, result, data_size, (const char *) data);
GNUNET_assert (GNUNET_YES == result);
GNUNET_assert (GNUNET_YES == is_guest_nym_added);
@@ -600,7 +600,7 @@
{
struct ResultClosure *rcls = cls;
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "guest_look_for_result: %d\n", result_code);
+ "guest_look_for_result: %" PRId64 "\n", result_code);
GNUNET_assert (GNUNET_OK == result_code);
GNUNET_assert (3 == rcls->n);
GNUNET_free (rcls);
@@ -620,7 +620,7 @@
rcls->n++;
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"guest_look_for_var: %s\n%.*s\n",
- name, value_size, value);
+ name, value_size, (const char *) value);
}
@@ -640,7 +640,7 @@
struct ResultClosure *rcls = cls;
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "guest_look_at_result: %d\n", result_code);
+ "guest_look_at_result: %" PRId64 "\n", result_code);
GNUNET_assert (GNUNET_OK == result_code);
GNUNET_assert (1 == rcls->n);
GNUNET_free (rcls);
@@ -661,7 +661,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"guest_look_at_var: %s\n%.*s\n",
- name, value_size, value);
+ name, value_size, (const char *) value);
}
@@ -680,9 +680,9 @@
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Test #%u: Guest received latest history replay result "
- "(%lu messages, %" PRId64 " fragments):\n"
+ "(%" PRIu32 " messages, %" PRId64 " fragments):\n"
"%.*s\n",
- test, counter, result, data_size, data);
+ test, counter, result, data_size, (const char *) data);
//GNUNET_assert (2 == counter); /* message count */
//GNUNET_assert (7 == result); /* fragment count */
@@ -710,7 +710,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Test #%u: Guest received history replay result: %" PRId64 "\n"
"%.*s\n",
- test, result, data_size, data);
+ test, result, data_size, (const char *) data);
// GNUNET_assert (2 == counter); /* message count */
// GNUNET_assert (7 == result); /* fragment count */
@@ -760,7 +760,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Test #%u: Guest received modifier for message ID %" PRIu64 ":\n"
"%c%s: %.*s (size: %u)\n",
- test, message_id, oper, name, value_size, value, value_size);
+ test, message_id, oper, name, value_size, (const char *) value,
value_size);
/** @todo FIXME: check modifier */
}
@@ -778,7 +778,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Test #%u: Guest received modifier matching _foo_bar for message
ID %" PRIu64 ":\n"
"%c%s: %.*s (size: %u)\n",
- test, message_id, oper, name, value_size, value, value_size);
+ test, message_id, oper, name, value_size, (const char *) value,
value_size);
struct ResultClosure *rc = cls;
rc->n++;
/** @todo FIXME: check modifier */
@@ -796,7 +796,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Test #%u: Guest received data for message ID %" PRIu64 ":\n"
"%.*s\n",
- test, message_id, data_size, data);
+ test, message_id, data_size, (const char *) data);
/** @todo FIXME: check data */
}
@@ -872,7 +872,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Test #%u: Host received modifier for message ID %" PRIu64 ":\n"
"%c%s: %.*s\n",
- test, message_id, oper, name, value_size, value);
+ test, message_id, oper, name, value_size, (const char *) value);
}
@@ -887,7 +887,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Test #%u: Host received data for message ID %" PRIu64 ":\n"
"%.*s\n",
- test, message_id, data_size, data);
+ test, message_id, data_size, (const char *) data);
}
@@ -1042,7 +1042,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%s\n%.*s\n",
- method_name, data_size, data);
+ method_name, data_size, (const char *) data);
/** @todo FIXME: check response message */
}
@@ -1084,7 +1084,7 @@
test, join_req_count);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%s\n%.*s\n",
- method_name, data_size, data);
+ method_name, data_size, (const char *) data);
switch (test)
{
@@ -1285,6 +1285,7 @@
app_recv_ego,
app_recv_host,
app_recv_guest,
+ app_connected,
NULL);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37143 - gnunet/src/social,
gnunet <=