[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37247 - gnunet/src/my
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37247 - gnunet/src/my |
Date: |
Tue, 7 Jun 2016 13:16:44 +0200 |
Author: christophe.genevey
Date: 2016-06-07 13:16:44 +0200 (Tue, 07 Jun 2016)
New Revision: 37247
Modified:
gnunet/src/my/my.c
gnunet/src/my/my_result_helper.c
gnunet/src/my/test_my.c
Log:
start to fix extract vsize
Modified: gnunet/src/my/my.c
===================================================================
--- gnunet/src/my/my.c 2016-06-06 20:44:39 UTC (rev 37246)
+++ gnunet/src/my/my.c 2016-06-07 11:16:44 UTC (rev 37247)
@@ -175,17 +175,10 @@
}
ret = mysql_stmt_fetch (stmt);
-
- if (MYSQL_DATA_TRUNCATED == ret)
- {
- fprintf(stderr, "Data truncated with error %d \n", ret);
- fprintf(stderr, "nontruncated length of the parameter values : %d\n",
rs[0].mysql_bind_output_length);
- return GNUNET_SYSERR;
- }
-
+
if (MYSQL_NO_DATA == ret)
return GNUNET_NO;
- if (0 != ret)
+ if ((0 != ret ) & (MYSQL_DATA_TRUNCATED != ret))
{
GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
"my",
Modified: gnunet/src/my/my_result_helper.c
===================================================================
--- gnunet/src/my/my_result_helper.c 2016-06-06 20:44:39 UTC (rev 37246)
+++ gnunet/src/my/my_result_helper.c 2016-06-07 11:16:44 UTC (rev 37247)
@@ -40,7 +40,7 @@
results[0].buffer = NULL;
results[0].buffer_length = 0;
results[0].length = &rs->mysql_bind_output_length;
- results[0].buffer_type = MYSQL_TYPE_BLOB;
+ // results[0].buffer_type = MYSQL_TYPE_BLOB;
return GNUNET_OK;
}
@@ -69,12 +69,17 @@
size_t size;
size = (size_t) rs->mysql_bind_output_length;
+
if (rs->mysql_bind_output_length != size)
return GNUNET_SYSERR; /* 'unsigned long' does not fit in size_t!? */
buf = GNUNET_malloc (size);
+
results[0].buffer = buf;
results[0].buffer_length = size;
+ results[0].buffer_type = MYSQL_TYPE_BLOB;
+ fprintf(stderr, "size : %d\n", size);
+
if (0 !=
mysql_stmt_fetch_column (stmt,
results,
@@ -84,8 +89,12 @@
GNUNET_free (buf);
return GNUNET_SYSERR;
}
+
+ printf("buf : %s\n", (char*)buf);
+
*(void **) rs->dst = buf;
*rs->result_size = size;
+
return GNUNET_OK;
}
Modified: gnunet/src/my/test_my.c
===================================================================
--- gnunet/src/my/test_my.c 2016-06-06 20:44:39 UTC (rev 37246)
+++ gnunet/src/my/test_my.c 2016-06-07 11:16:44 UTC (rev 37247)
@@ -162,7 +162,7 @@
" abs_time"
",forever"
",hash"
- //" vsize"
+ ",vsize"
",u16"
",u32"
",u64"
@@ -206,7 +206,7 @@
GNUNET_MY_result_spec_absolute_time (&abs_time2),
GNUNET_MY_result_spec_absolute_time (&forever2),
GNUNET_MY_result_spec_auto_from_type (&hc2),
- //GNUNET_MY_result_spec_variable_size (&msg2, &msg2_len),
+ GNUNET_MY_result_spec_variable_size (&msg2, &msg2_len),
GNUNET_MY_result_spec_uint16 (&u162),
GNUNET_MY_result_spec_uint32 (&u322),
GNUNET_MY_result_spec_uint64 (&u642),
@@ -224,6 +224,12 @@
&hc2,
sizeof (struct GNUNET_HashCode)));
+ GNUNET_break (strlen (msg) == msg2_len);
+ GNUNET_break (0 ==
+ strncmp (msg,
+ msg2,
+ msg2_len));
+ fprintf(stderr, "msg2 : %d\n", strlen(msg2));
GNUNET_break (16 == u162);
GNUNET_break (32 == u322);
GNUNET_break (64 == u642);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37247 - gnunet/src/my,
gnunet <=