aboutsummaryrefslogtreecommitdiff
path: root/src/pq
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-03-21 13:41:12 +0000
committerChristian Grothoff <christian@grothoff.org>2016-03-21 13:41:12 +0000
commit1733de7305720882b8745e82b51b6ff47c10099e (patch)
treedf9199b0e8670b089ead17186b191b80629bda8f /src/pq
parent60de5f48cbfc3868570284e91415ca7e06c390e1 (diff)
downloadgnunet-1733de7305720882b8745e82b51b6ff47c10099e.tar.gz
gnunet-1733de7305720882b8745e82b51b6ff47c10099e.zip
fixing symbol naming and coding convention issues
Diffstat (limited to 'src/pq')
-rw-r--r--src/pq/pq_query_helper.c8
-rw-r--r--src/pq/pq_result_helper.c12
-rw-r--r--src/pq/test_pq.c10
3 files changed, 15 insertions, 15 deletions
diff --git a/src/pq/pq_query_helper.c b/src/pq/pq_query_helper.c
index 13c71446c..d284822c2 100644
--- a/src/pq/pq_query_helper.c
+++ b/src/pq/pq_query_helper.c
@@ -265,7 +265,7 @@ qconv_rsa_public_key (void *cls,
265 void *scratch[], 265 void *scratch[],
266 unsigned int scratch_length) 266 unsigned int scratch_length)
267{ 267{
268 const struct GNUNET_CRYPTO_rsa_PublicKey *rsa = data; 268 const struct GNUNET_CRYPTO_RsaPublicKey *rsa = data;
269 char *buf; 269 char *buf;
270 size_t buf_size; 270 size_t buf_size;
271 271
@@ -290,7 +290,7 @@ qconv_rsa_public_key (void *cls,
290 * @return array entry for the query parameters to use 290 * @return array entry for the query parameters to use
291 */ 291 */
292struct GNUNET_PQ_QueryParam 292struct GNUNET_PQ_QueryParam
293GNUNET_PQ_query_param_rsa_public_key (const struct GNUNET_CRYPTO_rsa_PublicKey *x) 293GNUNET_PQ_query_param_rsa_public_key (const struct GNUNET_CRYPTO_RsaPublicKey *x)
294{ 294{
295 struct GNUNET_PQ_QueryParam res = 295 struct GNUNET_PQ_QueryParam res =
296 { &qconv_rsa_public_key, NULL, (x), 0, 1 }; 296 { &qconv_rsa_public_key, NULL, (x), 0, 1 };
@@ -323,7 +323,7 @@ qconv_rsa_signature (void *cls,
323 void *scratch[], 323 void *scratch[],
324 unsigned int scratch_length) 324 unsigned int scratch_length)
325{ 325{
326 const struct GNUNET_CRYPTO_rsa_Signature *sig = data; 326 const struct GNUNET_CRYPTO_RsaSignature *sig = data;
327 char *buf; 327 char *buf;
328 size_t buf_size; 328 size_t buf_size;
329 329
@@ -348,7 +348,7 @@ qconv_rsa_signature (void *cls,
348 * @return array entry for the query parameters to use 348 * @return array entry for the query parameters to use
349 */ 349 */
350struct GNUNET_PQ_QueryParam 350struct GNUNET_PQ_QueryParam
351GNUNET_PQ_query_param_rsa_signature (const struct GNUNET_CRYPTO_rsa_Signature *x) 351GNUNET_PQ_query_param_rsa_signature (const struct GNUNET_CRYPTO_RsaSignature *x)
352{ 352{
353 struct GNUNET_PQ_QueryParam res = 353 struct GNUNET_PQ_QueryParam res =
354 { &qconv_rsa_signature, NULL, (x), 0, 1 }; 354 { &qconv_rsa_signature, NULL, (x), 0, 1 };
diff --git a/src/pq/pq_result_helper.c b/src/pq/pq_result_helper.c
index 48f073cda..8baf0b00f 100644
--- a/src/pq/pq_result_helper.c
+++ b/src/pq/pq_result_helper.c
@@ -233,7 +233,7 @@ extract_rsa_public_key (void *cls,
233 size_t *dst_size, 233 size_t *dst_size,
234 void *dst) 234 void *dst)
235{ 235{
236 struct GNUNET_CRYPTO_rsa_PublicKey **pk = dst; 236 struct GNUNET_CRYPTO_RsaPublicKey **pk = dst;
237 size_t len; 237 size_t len;
238 const char *res; 238 const char *res;
239 int fnum; 239 int fnum;
@@ -285,7 +285,7 @@ static void
285clean_rsa_public_key (void *cls, 285clean_rsa_public_key (void *cls,
286 void *rd) 286 void *rd)
287{ 287{
288 struct GNUNET_CRYPTO_rsa_PublicKey **pk = rd; 288 struct GNUNET_CRYPTO_RsaPublicKey **pk = rd;
289 289
290 if (NULL != *pk) 290 if (NULL != *pk)
291 { 291 {
@@ -304,7 +304,7 @@ clean_rsa_public_key (void *cls,
304 */ 304 */
305struct GNUNET_PQ_ResultSpec 305struct GNUNET_PQ_ResultSpec
306GNUNET_PQ_result_spec_rsa_public_key (const char *name, 306GNUNET_PQ_result_spec_rsa_public_key (const char *name,
307 struct GNUNET_CRYPTO_rsa_PublicKey **rsa) 307 struct GNUNET_CRYPTO_RsaPublicKey **rsa)
308{ 308{
309 struct GNUNET_PQ_ResultSpec res = 309 struct GNUNET_PQ_ResultSpec res =
310 { &extract_rsa_public_key, 310 { &extract_rsa_public_key,
@@ -337,7 +337,7 @@ extract_rsa_signature (void *cls,
337 size_t *dst_size, 337 size_t *dst_size,
338 void *dst) 338 void *dst)
339{ 339{
340 struct GNUNET_CRYPTO_rsa_Signature **sig = dst; 340 struct GNUNET_CRYPTO_RsaSignature **sig = dst;
341 size_t len; 341 size_t len;
342 const char *res; 342 const char *res;
343 int fnum; 343 int fnum;
@@ -389,7 +389,7 @@ static void
389clean_rsa_signature (void *cls, 389clean_rsa_signature (void *cls,
390 void *rd) 390 void *rd)
391{ 391{
392 struct GNUNET_CRYPTO_rsa_Signature **sig = rd; 392 struct GNUNET_CRYPTO_RsaSignature **sig = rd;
393 393
394 if (NULL != *sig) 394 if (NULL != *sig)
395 { 395 {
@@ -408,7 +408,7 @@ clean_rsa_signature (void *cls,
408 */ 408 */
409struct GNUNET_PQ_ResultSpec 409struct GNUNET_PQ_ResultSpec
410GNUNET_PQ_result_spec_rsa_signature (const char *name, 410GNUNET_PQ_result_spec_rsa_signature (const char *name,
411 struct GNUNET_CRYPTO_rsa_Signature **sig) 411 struct GNUNET_CRYPTO_RsaSignature **sig)
412{ 412{
413 struct GNUNET_PQ_ResultSpec res = 413 struct GNUNET_PQ_ResultSpec res =
414 { &extract_rsa_signature, 414 { &extract_rsa_signature,
diff --git a/src/pq/test_pq.c b/src/pq/test_pq.c
index b9bf1be76..b8ffc6403 100644
--- a/src/pq/test_pq.c
+++ b/src/pq/test_pq.c
@@ -89,10 +89,10 @@ postgres_prepare (PGconn *db_conn)
89static int 89static int
90run_queries (PGconn *conn) 90run_queries (PGconn *conn)
91{ 91{
92 struct GNUNET_CRYPTO_rsa_PublicKey *pub; 92 struct GNUNET_CRYPTO_RsaPublicKey *pub;
93 struct GNUNET_CRYPTO_rsa_PublicKey *pub2 = NULL; 93 struct GNUNET_CRYPTO_RsaPublicKey *pub2 = NULL;
94 struct GNUNET_CRYPTO_rsa_Signature *sig; 94 struct GNUNET_CRYPTO_RsaSignature *sig;
95 struct GNUNET_CRYPTO_rsa_Signature *sig2 = NULL; 95 struct GNUNET_CRYPTO_RsaSignature *sig2 = NULL;
96 struct GNUNET_TIME_Absolute abs_time = GNUNET_TIME_absolute_get (); 96 struct GNUNET_TIME_Absolute abs_time = GNUNET_TIME_absolute_get ();
97 struct GNUNET_TIME_Absolute abs_time2; 97 struct GNUNET_TIME_Absolute abs_time2;
98 struct GNUNET_TIME_Absolute forever = GNUNET_TIME_UNIT_FOREVER_ABS; 98 struct GNUNET_TIME_Absolute forever = GNUNET_TIME_UNIT_FOREVER_ABS;
@@ -101,7 +101,7 @@ run_queries (PGconn *conn)
101 struct GNUNET_HashCode hc2; 101 struct GNUNET_HashCode hc2;
102 PGresult *result; 102 PGresult *result;
103 int ret; 103 int ret;
104 struct GNUNET_CRYPTO_rsa_PrivateKey *priv; 104 struct GNUNET_CRYPTO_RsaPrivateKey *priv;
105 char msg[] = "Hello"; 105 char msg[] = "Hello";
106 void *msg2; 106 void *msg2;
107 size_t msg2_len; 107 size_t msg2_len;