diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/conversation/gnunet-service-conversation.c | 20 | ||||
-rw-r--r-- | src/include/gnunet_postgres_lib.h | 4 | ||||
-rw-r--r-- | src/include/winproc.h | 2 | ||||
-rw-r--r-- | src/postgres/postgres.c | 6 | ||||
-rw-r--r-- | src/scalarproduct/gnunet-service-scalarproduct.c | 8 |
5 files changed, 20 insertions, 20 deletions
diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c index 181ba8351..d9af9a523 100644 --- a/src/conversation/gnunet-service-conversation.c +++ b/src/conversation/gnunet-service-conversation.c | |||
@@ -967,8 +967,8 @@ transmit_audio_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
967 | * Function to handle a initiation messaage incoming over mesh | 967 | * Function to handle a initiation messaage incoming over mesh |
968 | * @param cls closure, NULL | 968 | * @param cls closure, NULL |
969 | * @param tunnel the tunnel over which the message arrived | 969 | * @param tunnel the tunnel over which the message arrived |
970 | * @pram tunnel_ctx the tunnel context, can be NULL | 970 | * @param tunnel_ctx the tunnel context, can be NULL |
971 | * @pram message the incoming message | 971 | * @param message the incoming message |
972 | * | 972 | * |
973 | * @return GNUNET_OK | 973 | * @return GNUNET_OK |
974 | */ | 974 | */ |
@@ -1097,8 +1097,8 @@ handle_mesh_initiate_message (void *cls, struct GNUNET_MESH_Tunnel *tunnel, | |||
1097 | * Function to handle an accept messaage incoming over mesh | 1097 | * Function to handle an accept messaage incoming over mesh |
1098 | * @param cls closure, NULL | 1098 | * @param cls closure, NULL |
1099 | * @param tunnel the tunnel over which the message arrived | 1099 | * @param tunnel the tunnel over which the message arrived |
1100 | * @pram tunnel_ctx the tunnel context, can be NULL | 1100 | * @param tunnel_ctx the tunnel context, can be NULL |
1101 | * @pram message the incoming message | 1101 | * @param message the incoming message |
1102 | * | 1102 | * |
1103 | * @return GNUNET_OK | 1103 | * @return GNUNET_OK |
1104 | */ | 1104 | */ |
@@ -1177,8 +1177,8 @@ handle_mesh_accept_message (void *cls, struct GNUNET_MESH_Tunnel *tunnel, | |||
1177 | * Function to handle a reject messaage incoming over mesh | 1177 | * Function to handle a reject messaage incoming over mesh |
1178 | * @param cls closure, NULL | 1178 | * @param cls closure, NULL |
1179 | * @param tunnel the tunnel over which the message arrived | 1179 | * @param tunnel the tunnel over which the message arrived |
1180 | * @pram tunnel_ctx the tunnel context, can be NULL | 1180 | * @param tunnel_ctx the tunnel context, can be NULL |
1181 | * @pram message the incoming message | 1181 | * @param message the incoming message |
1182 | * | 1182 | * |
1183 | * @return GNUNET_OK | 1183 | * @return GNUNET_OK |
1184 | */ | 1184 | */ |
@@ -1230,8 +1230,8 @@ handle_mesh_reject_message (void *cls, struct GNUNET_MESH_Tunnel *tunnel, | |||
1230 | * Function to handle a terminate messaage incoming over mesh | 1230 | * Function to handle a terminate messaage incoming over mesh |
1231 | * @param cls closure, NULL | 1231 | * @param cls closure, NULL |
1232 | * @param tunnel the tunnel over which the message arrived | 1232 | * @param tunnel the tunnel over which the message arrived |
1233 | * @pram tunnel_ctx the tunnel context, can be NULL | 1233 | * @param tunnel_ctx the tunnel context, can be NULL |
1234 | * @pram message the incoming message | 1234 | * @param message the incoming message |
1235 | * | 1235 | * |
1236 | * @return GNUNET_OK | 1236 | * @return GNUNET_OK |
1237 | */ | 1237 | */ |
@@ -1275,8 +1275,8 @@ handle_mesh_terminate_message (void *cls, struct GNUNET_MESH_Tunnel *tunnel, | |||
1275 | * Function to handle a audio messaage incoming over mesh | 1275 | * Function to handle a audio messaage incoming over mesh |
1276 | * @param cls closure, NULL | 1276 | * @param cls closure, NULL |
1277 | * @param tunnel the tunnel over which the message arrived | 1277 | * @param tunnel the tunnel over which the message arrived |
1278 | * @pram tunnel_ctx the tunnel context, can be NULL | 1278 | * @param tunnel_ctx the tunnel context, can be NULL |
1279 | * @pram message the incoming message | 1279 | * @param message the incoming message |
1280 | * | 1280 | * |
1281 | * @return GNUNET_OK | 1281 | * @return GNUNET_OK |
1282 | */ | 1282 | */ |
diff --git a/src/include/gnunet_postgres_lib.h b/src/include/gnunet_postgres_lib.h index 559793daf..8f7204748 100644 --- a/src/include/gnunet_postgres_lib.h +++ b/src/include/gnunet_postgres_lib.h | |||
@@ -101,14 +101,14 @@ GNUNET_POSTGRES_exec_ (PGconn *dbh, const char *sql, const char *filename, int l | |||
101 | * @param dbh database handle | 101 | * @param dbh database handle |
102 | * @param name name for the prepared SQL statement | 102 | * @param name name for the prepared SQL statement |
103 | * @param sql SQL code to prepare | 103 | * @param sql SQL code to prepare |
104 | * @param nparms number of parameters in sql | 104 | * @param nparams number of parameters in sql |
105 | * @param filename filename for error reporting | 105 | * @param filename filename for error reporting |
106 | * @param line code line for error reporting | 106 | * @param line code line for error reporting |
107 | * @return GNUNET_OK on success | 107 | * @return GNUNET_OK on success |
108 | */ | 108 | */ |
109 | int | 109 | int |
110 | GNUNET_POSTGRES_prepare_ (PGconn *dbh, const char *name, const char *sql, | 110 | GNUNET_POSTGRES_prepare_ (PGconn *dbh, const char *name, const char *sql, |
111 | int nparms, | 111 | int nparams, |
112 | const char *filename, int line); | 112 | const char *filename, int line); |
113 | 113 | ||
114 | 114 | ||
diff --git a/src/include/winproc.h b/src/include/winproc.h index 9a9ae4b7a..78246c58e 100644 --- a/src/include/winproc.h +++ b/src/include/winproc.h | |||
@@ -112,7 +112,7 @@ extern "C" | |||
112 | typedef NET_API_STATUS WINAPI (*TNetUserSetInfo) (LPCWSTR servername, | 112 | typedef NET_API_STATUS WINAPI (*TNetUserSetInfo) (LPCWSTR servername, |
113 | LPCWSTR username, | 113 | LPCWSTR username, |
114 | DWORD level, LPBYTE buf, | 114 | DWORD level, LPBYTE buf, |
115 | LPDWORD parm_err); | 115 | LPDWORD param_err); |
116 | typedef NTSTATUS NTAPI (*TLsaOpenPolicy) (PLSA_UNICODE_STRING, | 116 | typedef NTSTATUS NTAPI (*TLsaOpenPolicy) (PLSA_UNICODE_STRING, |
117 | PLSA_OBJECT_ATTRIBUTES, ACCESS_MASK, | 117 | PLSA_OBJECT_ATTRIBUTES, ACCESS_MASK, |
118 | PLSA_HANDLE); | 118 | PLSA_HANDLE); |
diff --git a/src/postgres/postgres.c b/src/postgres/postgres.c index 100145289..d2d52aec5 100644 --- a/src/postgres/postgres.c +++ b/src/postgres/postgres.c | |||
@@ -96,18 +96,18 @@ GNUNET_POSTGRES_exec_ (PGconn * dbh, const char *sql, const char *filename, | |||
96 | * @param dbh database handle | 96 | * @param dbh database handle |
97 | * @param name name for the prepared SQL statement | 97 | * @param name name for the prepared SQL statement |
98 | * @param sql SQL code to prepare | 98 | * @param sql SQL code to prepare |
99 | * @param nparms number of parameters in sql | 99 | * @param nparams number of parameters in sql |
100 | * @param filename filename for error reporting | 100 | * @param filename filename for error reporting |
101 | * @param line code line for error reporting | 101 | * @param line code line for error reporting |
102 | * @return GNUNET_OK on success | 102 | * @return GNUNET_OK on success |
103 | */ | 103 | */ |
104 | int | 104 | int |
105 | GNUNET_POSTGRES_prepare_ (PGconn * dbh, const char *name, const char *sql, | 105 | GNUNET_POSTGRES_prepare_ (PGconn * dbh, const char *name, const char *sql, |
106 | int nparms, const char *filename, int line) | 106 | int nparams, const char *filename, int line) |
107 | { | 107 | { |
108 | PGresult *ret; | 108 | PGresult *ret; |
109 | 109 | ||
110 | ret = PQprepare (dbh, name, sql, nparms, NULL); | 110 | ret = PQprepare (dbh, name, sql, nparams, NULL); |
111 | if (GNUNET_OK != | 111 | if (GNUNET_OK != |
112 | GNUNET_POSTGRES_check_result_ (dbh, ret, PGRES_COMMAND_OK, "PQprepare", | 112 | GNUNET_POSTGRES_check_result_ (dbh, ret, PGRES_COMMAND_OK, "PQprepare", |
113 | sql, filename, line)) | 113 | sql, filename, line)) |
diff --git a/src/scalarproduct/gnunet-service-scalarproduct.c b/src/scalarproduct/gnunet-service-scalarproduct.c index 99ae47332..ec3dbe893 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct.c +++ b/src/scalarproduct/gnunet-service-scalarproduct.c | |||
@@ -271,7 +271,7 @@ static int do_shutdown; | |||
271 | static void | 271 | static void |
272 | generate_keyset () | 272 | generate_keyset () |
273 | { | 273 | { |
274 | gcry_sexp_t gen_parms; | 274 | gcry_sexp_t gen_params; |
275 | gcry_sexp_t key; | 275 | gcry_sexp_t key; |
276 | gcry_sexp_t tmp_sexp; | 276 | gcry_sexp_t tmp_sexp; |
277 | gcry_mpi_t p; | 277 | gcry_mpi_t p; |
@@ -283,12 +283,12 @@ generate_keyset () | |||
283 | size_t erroff = 0; | 283 | size_t erroff = 0; |
284 | 284 | ||
285 | // we can still use the RSA keygen for generating p,q,n, but using e is pointless. | 285 | // we can still use the RSA keygen for generating p,q,n, but using e is pointless. |
286 | GNUNET_assert (0 == gcry_sexp_build (&gen_parms, &erroff, | 286 | GNUNET_assert (0 == gcry_sexp_build (&gen_params, &erroff, |
287 | "(genkey(rsa(nbits %d)(rsa-use-e 3:257)))", | 287 | "(genkey(rsa(nbits %d)(rsa-use-e 3:257)))", |
288 | KEYBITS)); | 288 | KEYBITS)); |
289 | 289 | ||
290 | GNUNET_assert (0 == gcry_pk_genkey (&key, gen_parms)); | 290 | GNUNET_assert (0 == gcry_pk_genkey (&key, gen_params)); |
291 | gcry_sexp_release (gen_parms); | 291 | gcry_sexp_release (gen_params); |
292 | 292 | ||
293 | // get n and d of our publickey as MPI | 293 | // get n and d of our publickey as MPI |
294 | tmp_sexp = gcry_sexp_find_token (key, "n", 0); | 294 | tmp_sexp = gcry_sexp_find_token (key, "n", 0); |