aboutsummaryrefslogtreecommitdiff
path: root/src/set/gnunet-set-profiler.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2014-11-27 10:04:14 +0000
committerChristian Grothoff <christian@grothoff.org>2014-11-27 10:04:14 +0000
commit47c52147dac6bc423b43aa8e2721585df893440b (patch)
treef70838a0ad5400cc100ec948a6ccb6295a509379 /src/set/gnunet-set-profiler.c
parent4d376fad783520443f21216de0eed2d8cfc43c97 (diff)
downloadgnunet-47c52147dac6bc423b43aa8e2721585df893440b.tar.gz
gnunet-47c52147dac6bc423b43aa8e2721585df893440b.zip
rename element's type field to 'element_type'
Diffstat (limited to 'src/set/gnunet-set-profiler.c')
-rw-r--r--src/set/gnunet-set-profiler.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/set/gnunet-set-profiler.c b/src/set/gnunet-set-profiler.c
index f1b7b4b14..3bff45254 100644
--- a/src/set/gnunet-set-profiler.c
+++ b/src/set/gnunet-set-profiler.c
@@ -143,18 +143,19 @@ set_listen_cb (void *cls,
143{ 143{
144 if (NULL == request) 144 if (NULL == request)
145 { 145 {
146 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "listener failed\n"); 146 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
147 "listener failed\n");
147 return; 148 return;
148 } 149 }
149 GNUNET_assert (NULL == info2.oh); 150 GNUNET_assert (NULL == info2.oh);
150 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "set listen cb called\n"); 151 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
152 "set listen cb called\n");
151 info2.oh = GNUNET_SET_accept (request, GNUNET_SET_RESULT_ADDED, 153 info2.oh = GNUNET_SET_accept (request, GNUNET_SET_RESULT_ADDED,
152 set_result_cb, &info2); 154 set_result_cb, &info2);
153 GNUNET_SET_commit (info2.oh, info2.set); 155 GNUNET_SET_commit (info2.oh, info2.set);
154} 156}
155 157
156 158
157
158static int 159static int
159set_insert_iterator (void *cls, 160set_insert_iterator (void *cls,
160 const struct GNUNET_HashCode *key, 161 const struct GNUNET_HashCode *key,
@@ -163,8 +164,9 @@ set_insert_iterator (void *cls,
163 struct GNUNET_SET_Handle *set = cls; 164 struct GNUNET_SET_Handle *set = cls;
164 struct GNUNET_SET_Element *el; 165 struct GNUNET_SET_Element *el;
165 166
166 el = GNUNET_malloc (sizeof *el + sizeof *key); 167 el = GNUNET_malloc (sizeof (struct GNUNET_SET_Element) +
167 el->type = 0; 168 sizeof (struct GNUNET_HashCode));
169 el->element_type = 0;
168 memcpy (&el[1], key, sizeof *key); 170 memcpy (&el[1], key, sizeof *key);
169 el->data = &el[1]; 171 el->data = &el[1];
170 el->size = sizeof *key; 172 el->size = sizeof *key;
@@ -205,6 +207,7 @@ handle_shutdown (void *cls,
205 } 207 }
206} 208}
207 209
210
208static void 211static void
209run (void *cls, char *const *args, const char *cfgfile, 212run (void *cls, char *const *args, const char *cfgfile,
210 const struct GNUNET_CONFIGURATION_Handle *cfg) 213 const struct GNUNET_CONFIGURATION_Handle *cfg)