projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'credentials' of git+ssh://gnunet.org/gnunet into credentials
[oweals/gnunet.git]
/
src
/
my
/
my.c
diff --git
a/src/my/my.c
b/src/my/my.c
index cec22716f07d64018f541bf02b0873d7c96c125e..459f09b6a4b65227c88ad532db1d4ea18c054357 100644
(file)
--- a/
src/my/my.c
+++ b/
src/my/my.c
@@
-27,7
+27,6
@@
#include <mysql/mysql.h>
#include "gnunet_my_lib.h"
#include <mysql/mysql.h>
#include "gnunet_my_lib.h"
-#define STRING_SIZE 50
/**
* Run a prepared SELECT statement.
/**
* Run a prepared SELECT statement.
@@
-42,7
+41,7
@@
int
GNUNET_MY_exec_prepared (struct GNUNET_MYSQL_Context *mc,
struct GNUNET_MYSQL_StatementHandle *sh,
int
GNUNET_MY_exec_prepared (struct GNUNET_MYSQL_Context *mc,
struct GNUNET_MYSQL_StatementHandle *sh,
-
const
struct GNUNET_MY_QueryParam *params)
+ struct GNUNET_MY_QueryParam *params)
{
const struct GNUNET_MY_QueryParam *p;
unsigned int num;
{
const struct GNUNET_MY_QueryParam *p;
unsigned int num;
@@
-56,7
+55,7
@@
GNUNET_MY_exec_prepared (struct GNUNET_MYSQL_Context *mc,
MYSQL_BIND qbind[num];
unsigned int off;
MYSQL_BIND qbind[num];
unsigned int off;
- memset(qbind, 0, sizeof(qbind));
+ memset
(qbind, 0, sizeof(qbind));
off = 0;
for (i=0;NULL != (p = ¶ms[i])->conv;i++)
{
off = 0;
for (i=0;NULL != (p = ¶ms[i])->conv;i++)
{
@@
-68,18
+67,19
@@
GNUNET_MY_exec_prepared (struct GNUNET_MYSQL_Context *mc,
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Conversion for MySQL query failed at offset %u\n",
i);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Conversion for MySQL query failed at offset %u\n",
i);
- GNUNET_MY_cleanup_query (params);
return GNUNET_SYSERR;
}
off += p->num_params;
}
return GNUNET_SYSERR;
}
off += p->num_params;
}
- stmt = GNUNET_MYSQL_statement_get_stmt (
mc,
sh);
+ stmt = GNUNET_MYSQL_statement_get_stmt (sh);
if (mysql_stmt_bind_param (stmt,
qbind))
{
if (mysql_stmt_bind_param (stmt,
qbind))
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "mysql",
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+ "my",
_("`%s' failed at %s:%d with error: %s\n"),
_("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_bind_param", __FILE__, __LINE__,
+ "mysql_stmt_bind_param",
+ __FILE__, __LINE__,
mysql_stmt_error (stmt));
GNUNET_MYSQL_statements_invalidate (mc);
return GNUNET_SYSERR;
mysql_stmt_error (stmt));
GNUNET_MYSQL_statements_invalidate (mc);
return GNUNET_SYSERR;
@@
-87,34
+87,38
@@
GNUNET_MY_exec_prepared (struct GNUNET_MYSQL_Context *mc,
if (mysql_stmt_execute (stmt))
{
if (mysql_stmt_execute (stmt))
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "mysql",
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+ "my",
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_execute", __FILE__, __LINE__,
mysql_stmt_error (stmt));
GNUNET_MYSQL_statements_invalidate (mc);
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_execute", __FILE__, __LINE__,
mysql_stmt_error (stmt));
GNUNET_MYSQL_statements_invalidate (mc);
- GNUNET_MY_cleanup_query (params);
return GNUNET_SYSERR;
}
return GNUNET_SYSERR;
}
+ GNUNET_MY_cleanup_query (params,
+ qbind);
}
}
-
return GNUNET_OK;
}
/**
* Free all memory that was allocated in @a qp during
return GNUNET_OK;
}
/**
* Free all memory that was allocated in @a qp during
- * #GNUNET_MY_exec
t
_prepared().
+ * #GNUNET_MY_exec_prepared().
*
* @param qp query specification to clean up
*
* @param qp query specification to clean up
+ * @param qbind array of parameter to clean up
*/
void
*/
void
-GNUNET_MY_cleanup_query (struct GNUNET_MY_QueryParam *qp)
+GNUNET_MY_cleanup_query (struct GNUNET_MY_QueryParam *qp,
+ MYSQL_BIND *qbind)
{
unsigned int i;
{
unsigned int i;
- for (i=0;NULL != qp[i].cleaner;i++)
- qp[i].cleaner (qp[i].conv_cls,
- &qp[i]);
+ for (i=0; NULL != qp[i].conv ;i++)
+ if (NULL != qp[i].cleaner)
+ qp[i].cleaner (qp[i].conv_cls,
+ &qbind[i]);
}
}
@@
-122,7
+126,6
@@
GNUNET_MY_cleanup_query (struct GNUNET_MY_QueryParam *qp)
* Extract results from a query result according to the given
* specification. Always fetches the next row.
*
* Extract results from a query result according to the given
* specification. Always fetches the next row.
*
- *
* @param sh statement that returned results
* @param rs specification to extract for
* @return
* @param sh statement that returned results
* @param rs specification to extract for
* @return
@@
-139,15
+142,17
@@
GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh,
int ret;
MYSQL_STMT *stmt;
int ret;
MYSQL_STMT *stmt;
- stmt = GNUNET_MYSQL_statement_get_stmt (
NULL /* FIXME */,
sh);
+ stmt = GNUNET_MYSQL_statement_get_stmt (sh);
if (NULL == stmt)
{
if (NULL == stmt)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "mysql",
- ("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_bind_result", __FILE__, __LINE__,
- mysql_stmt_error (stmt));
+ GNUNET_break (0);
return GNUNET_SYSERR;
}
return GNUNET_SYSERR;
}
+ if (NULL == rs)
+ {
+ mysql_stmt_free_result (stmt);
+ return GNUNET_NO;
+ }
num_fields = 0;
for (i=0;NULL != rs[i].pre_conv;i++)
num_fields = 0;
for (i=0;NULL != rs[i].pre_conv;i++)
@@
-176,36
+181,45
@@
GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh,
stmt,
field_off,
&result[field_off]))
stmt,
field_off,
&result[field_off]))
+
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Pre-conversion for MySQL result failed at offset %u\n",
i);
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Pre-conversion for MySQL result failed at offset %u\n",
i);
- GNUNET_MY_cleanup_result (rs);
return GNUNET_SYSERR;
}
field_off += rp->num_fields;
}
return GNUNET_SYSERR;
}
field_off += rp->num_fields;
}
+
if (mysql_stmt_bind_result (stmt, result))
{
GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
"my",
if (mysql_stmt_bind_result (stmt, result))
{
GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
"my",
- _("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_bind_result", __FILE__, __LINE__,
+ _("%s failed at %s:%d with error: %s\n"),
+ "mysql_stmt_bind_result",
+ __FILE__, __LINE__,
mysql_stmt_error (stmt));
return GNUNET_SYSERR;
}
mysql_stmt_error (stmt));
return GNUNET_SYSERR;
}
-
+#if TEST_OPTIMIZATION
+ (void) mysql_stmt_store_result (stmt);
+#endif
ret = mysql_stmt_fetch (stmt);
ret = mysql_stmt_fetch (stmt);
-
if (MYSQL_NO_DATA == ret)
if (MYSQL_NO_DATA == ret)
+ {
+ mysql_stmt_free_result (stmt);
return GNUNET_NO;
return GNUNET_NO;
- if ((0 != ret ) && (MYSQL_DATA_TRUNCATED != ret))
+ }
+ if (1 == ret)
{
GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
"my",
{
GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
"my",
- _("mysql_stmt_fetch failed at %s:%d with error: %s\n"),
+ _("%s failed at %s:%d with error: %s\n"),
+ "mysql_stmt_fetch",
__FILE__, __LINE__,
mysql_stmt_error (stmt));
__FILE__, __LINE__,
mysql_stmt_error (stmt));
+ GNUNET_MY_cleanup_result (rs);
+ mysql_stmt_free_result (stmt);
return GNUNET_SYSERR;
}
field_off = 0;
return GNUNET_SYSERR;
}
field_off = 0;
@@
-221,9
+235,10
@@
GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh,
field_off,
&result[field_off]))
{
field_off,
&result[field_off]))
{
- GNUNET_log (GNUNET_ERROR_TYPE_
ERROR
,
+ GNUNET_log (GNUNET_ERROR_TYPE_
INFO
,
"Post-conversion for MySQL result failed at offset %u\n",
i);
"Post-conversion for MySQL result failed at offset %u\n",
i);
+ mysql_stmt_free_result (stmt);
GNUNET_MY_cleanup_result (rs);
return GNUNET_SYSERR;
}
GNUNET_MY_cleanup_result (rs);
return GNUNET_SYSERR;
}
@@
-238,16
+253,17
@@
GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh,
* Free all memory that was allocated in @a rs during
* #GNUNET_MY_extract_result().
*
* Free all memory that was allocated in @a rs during
* #GNUNET_MY_extract_result().
*
- * @param rs reult specification to clean up
+ * @param rs re
s
ult specification to clean up
*/
void
GNUNET_MY_cleanup_result (struct GNUNET_MY_ResultSpec *rs)
{
unsigned int i;
*/
void
GNUNET_MY_cleanup_result (struct GNUNET_MY_ResultSpec *rs)
{
unsigned int i;
- for (i=0;NULL != rs[i].cleaner;i++)
- rs[i].cleaner (rs[i].conv_cls,
- &rs[i]);
+ for (i=0;NULL != rs[i].post_conv;i++)
+ if (NULL != rs[i].cleaner)
+ rs[i].cleaner (rs[i].conv_cls,
+ &rs[i]);
}
}