From a138d74a08fd2eac2098ca2e60a4d7a7087d4e6e Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Wed, 3 Aug 2011 11:42:08 +0000 Subject: [PATCH] fixes --- src/mesh/gnunet-service-mesh.c | 4 ++-- src/mesh/test_mesh_small.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index 53c38ce5e..05baf4789 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c @@ -762,7 +762,7 @@ send_core_data_to_origin (void *cls, size_t size, void *buf) GNUNET_assert(NULL != info); total_size = sizeof(struct GNUNET_MESH_DataMessageToOrigin) + info->size; - GNUNET_assert(total_size < (uint16_t) -1); /* FIXME */ + GNUNET_assert(total_size < 65536); /* UNIT16_MAX */ if (total_size > size) { GNUNET_log(GNUNET_ERROR_TYPE_WARNING, @@ -805,7 +805,7 @@ send_core_data_raw (void *cls, size_t size, void *buf) "not enough buffer to send data futher\n"); return 0; } - memcpy(msg, buf, total_size); + memcpy(buf, msg, total_size); return total_size; } diff --git a/src/mesh/test_mesh_small.c b/src/mesh/test_mesh_small.c index 3c0b2eb67..b5c3939f8 100644 --- a/src/mesh/test_mesh_small.c +++ b/src/mesh/test_mesh_small.c @@ -581,7 +581,7 @@ run (void *cls, GNUNET_DISK_PERM_USER_WRITE); if (data_file == NULL) GNUNET_log(GNUNET_ERROR_TYPE_WARNING, - "Failed to open %s for output!\n", + "Failed to open %s for output!\n", data_filename); GNUNET_free(data_filename); @@ -651,4 +651,4 @@ main (int argc, char *argv[]) return ok; } -/* end of nse-profiler.c */ +/* end of test_mesh_small.c */ -- 2.25.1