diff options
Diffstat (limited to 'src/my/my.c')
-rw-r--r-- | src/my/my.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/my/my.c b/src/my/my.c index 89d8c3370..09d00163e 100644 --- a/src/my/my.c +++ b/src/my/my.c | |||
@@ -106,24 +106,27 @@ GNUNET_MY_exec_prepared (struct GNUNET_MYSQL_Context *mc, | |||
106 | */ | 106 | */ |
107 | int | 107 | int |
108 | GNUNET_MY_extract_result (MYSQL_BIND * result, | 108 | GNUNET_MY_extract_result (MYSQL_BIND * result, |
109 | int row, | 109 | struct GNUNET_MY_QueryParam *qp, |
110 | struct GNUNET_MY_ResultSpec *specs) | 110 | struct GNUNET_MY_ResultSpec *rs, |
111 | int row) | ||
111 | { | 112 | { |
112 | unsigned int i; | 113 | unsigned int i; |
113 | int had_null = GNUNET_NO; | 114 | int had_null = GNUNET_NO; |
114 | int ret; | 115 | int ret; |
115 | 116 | ||
116 | for(i = 0 ; NULL != specs[i].conv ; i++) | 117 | for(i = 0 ; NULL != rs[i].conv ; i++) |
117 | { | 118 | { |
118 | struct GNUNET_MY_ResultSpec *spec; | 119 | struct GNUNET_MY_ResultSpec *spec; |
119 | 120 | ||
120 | spec = &specs[i]; | 121 | spec = &rs[i]; |
121 | ret = spec->conv(spec->conv_cls, | 122 | ret = spec->conv(spec->conv_cls, |
122 | NULL, //wait GNUNET_MY_QueryParam | 123 | qp, |
123 | result); | 124 | result); |
124 | 125 | ||
125 | if(ret == GNUNET_SYSERR) | 126 | if(ret == GNUNET_SYSERR){ |
127 | //GNUNET_MY_cleanup_result(rs); | ||
126 | return GNUNET_SYSERR; | 128 | return GNUNET_SYSERR; |
129 | } | ||
127 | 130 | ||
128 | if(spec->result_size != NULL) | 131 | if(spec->result_size != NULL) |
129 | *spec->result_size = spec->dst_size; | 132 | *spec->result_size = spec->dst_size; |