diff options
Diffstat (limited to 'src/my/my.c')
| -rw-r--r-- | src/my/my.c | 44 |
1 files changed, 19 insertions, 25 deletions
diff --git a/src/my/my.c b/src/my/my.c index 459f09b6a4..2f4cd3ba38 100644 --- a/src/my/my.c +++ b/src/my/my.c @@ -1,21 +1,19 @@ /* This file is part of GNUnet - Copyright (C) 2016 Inria & GNUnet e.V. + Copyright (C) 2016, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ /** * @file my/my.c @@ -45,19 +43,20 @@ GNUNET_MY_exec_prepared (struct GNUNET_MYSQL_Context *mc, { const struct GNUNET_MY_QueryParam *p; unsigned int num; - unsigned int i; MYSQL_STMT *stmt; num = 0; - for (i=0;NULL != params[i].conv;i++) + for (unsigned int i=0;NULL != params[i].conv;i++) num += params[i].num_params; { 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++) + for (unsigned int i=0;NULL != (p = ¶ms[i])->conv;i++) { if (GNUNET_OK != p->conv (p->conv_cls, @@ -113,9 +112,7 @@ void GNUNET_MY_cleanup_query (struct GNUNET_MY_QueryParam *qp, MYSQL_BIND *qbind) { - unsigned int i; - - for (i=0; NULL != qp[i].conv ;i++) + for (unsigned int i=0; NULL != qp[i].conv ;i++) if (NULL != qp[i].cleaner) qp[i].cleaner (qp[i].conv_cls, &qbind[i]); @@ -138,7 +135,6 @@ GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh, struct GNUNET_MY_ResultSpec *rs) { unsigned int num_fields; - unsigned int i; int ret; MYSQL_STMT *stmt; @@ -155,7 +151,7 @@ GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh, } num_fields = 0; - for (i=0;NULL != rs[i].pre_conv;i++) + for (unsigned int i=0;NULL != rs[i].pre_conv;i++) num_fields += rs[i].num_fields; if (mysql_stmt_field_count (stmt) != num_fields) @@ -171,7 +167,7 @@ GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh, memset (result, 0, sizeof (MYSQL_BIND) * num_fields); field_off = 0; - for (i=0;NULL != rs[i].pre_conv;i++) + for (unsigned int i=0;NULL != rs[i].pre_conv;i++) { struct GNUNET_MY_ResultSpec *rp = &rs[i]; @@ -223,7 +219,7 @@ GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh, return GNUNET_SYSERR; } field_off = 0; - for (i=0;NULL != rs[i].post_conv;i++) + for (unsigned int i=0;NULL != rs[i].post_conv;i++) { struct GNUNET_MY_ResultSpec *rp = &rs[i]; @@ -258,9 +254,7 @@ GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh, void GNUNET_MY_cleanup_result (struct GNUNET_MY_ResultSpec *rs) { - unsigned int i; - - for (i=0;NULL != rs[i].post_conv;i++) + for (unsigned int i=0;NULL != rs[i].post_conv;i++) if (NULL != rs[i].cleaner) rs[i].cleaner (rs[i].conv_cls, &rs[i]); |