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)
 * Function to handle a initiation messaage incoming over mesh
  * @param cls closure, NULL
  * @param tunnel the tunnel over which the message arrived
- * @pram tunnel_ctx the tunnel context, can be NULL
- * @pram message the incoming message
+ * @param tunnel_ctx the tunnel context, can be NULL
+ * @param message the incoming message
  * 
  * @return GNUNET_OK
 */
@@ -1097,8 +1097,8 @@ handle_mesh_initiate_message (void *cls, struct GNUNET_MESH_Tunnel *tunnel,
 * Function to handle an accept messaage incoming over mesh
  * @param cls closure, NULL
  * @param tunnel the tunnel over which the message arrived
- * @pram tunnel_ctx the tunnel context, can be NULL
- * @pram message the incoming message
+ * @param tunnel_ctx the tunnel context, can be NULL
+ * @param message the incoming message
  * 
  * @return GNUNET_OK
 */
@@ -1177,8 +1177,8 @@ handle_mesh_accept_message (void *cls, struct GNUNET_MESH_Tunnel *tunnel,
 * Function to handle a reject messaage incoming over mesh
  * @param cls closure, NULL
  * @param tunnel the tunnel over which the message arrived
- * @pram tunnel_ctx the tunnel context, can be NULL
- * @pram message the incoming message
+ * @param tunnel_ctx the tunnel context, can be NULL
+ * @param message the incoming message
  * 
  * @return GNUNET_OK
 */
@@ -1230,8 +1230,8 @@ handle_mesh_reject_message (void *cls, struct GNUNET_MESH_Tunnel *tunnel,
 * Function to handle a terminate messaage incoming over mesh
  * @param cls closure, NULL
  * @param tunnel the tunnel over which the message arrived
- * @pram tunnel_ctx the tunnel context, can be NULL
- * @pram message the incoming message
+ * @param tunnel_ctx the tunnel context, can be NULL
+ * @param message the incoming message
  * 
  * @return GNUNET_OK
 */
@@ -1275,8 +1275,8 @@ handle_mesh_terminate_message (void *cls, struct GNUNET_MESH_Tunnel *tunnel,
 * Function to handle a audio messaage incoming over mesh
  * @param cls closure, NULL
  * @param tunnel the tunnel over which the message arrived
- * @pram tunnel_ctx the tunnel context, can be NULL
- * @pram message the incoming message
+ * @param tunnel_ctx the tunnel context, can be NULL
+ * @param message the incoming message
  * 
  * @return GNUNET_OK
 */
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
  * @param dbh database handle
  * @param name name for the prepared SQL statement
  * @param sql SQL code to prepare
- * @param nparms number of parameters in sql
+ * @param nparams number of parameters in sql
  * @param filename filename for error reporting
  * @param line code line for error reporting
  * @return GNUNET_OK on success
  */
 int
 GNUNET_POSTGRES_prepare_ (PGconn *dbh, const char *name, const char *sql,
-                          int nparms,
+                          int nparams,
                           const char *filename, int line);
 
 
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"
   typedef NET_API_STATUS WINAPI (*TNetUserSetInfo) (LPCWSTR servername,
                                                     LPCWSTR username,
                                                     DWORD level, LPBYTE buf,
-                                                    LPDWORD parm_err);
+                                                    LPDWORD param_err);
   typedef NTSTATUS NTAPI (*TLsaOpenPolicy) (PLSA_UNICODE_STRING,
                                             PLSA_OBJECT_ATTRIBUTES, ACCESS_MASK,
                                             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,
  * @param dbh database handle
  * @param name name for the prepared SQL statement
  * @param sql SQL code to prepare
- * @param nparms number of parameters in sql
+ * @param nparams number of parameters in sql
  * @param filename filename for error reporting
  * @param line code line for error reporting
  * @return GNUNET_OK on success
  */
 int
 GNUNET_POSTGRES_prepare_ (PGconn * dbh, const char *name, const char *sql,
-                          int nparms, const char *filename, int line)
+                          int nparams, const char *filename, int line)
 {
   PGresult *ret;
 
-  ret = PQprepare (dbh, name, sql, nparms, NULL);
+  ret = PQprepare (dbh, name, sql, nparams, NULL);
   if (GNUNET_OK !=
       GNUNET_POSTGRES_check_result_ (dbh, ret, PGRES_COMMAND_OK, "PQprepare",
                                      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;
 static void
 generate_keyset ()
 {
-  gcry_sexp_t gen_parms;
+  gcry_sexp_t gen_params;
   gcry_sexp_t key;
   gcry_sexp_t tmp_sexp;
   gcry_mpi_t p;
@@ -283,12 +283,12 @@ generate_keyset ()
   size_t erroff = 0;
 
   // we can still use the RSA keygen for generating p,q,n, but using e is pointless.
-  GNUNET_assert (0 == gcry_sexp_build (&gen_parms, &erroff,
+  GNUNET_assert (0 == gcry_sexp_build (&gen_params, &erroff,
                                        "(genkey(rsa(nbits %d)(rsa-use-e 3:257)))",
                                        KEYBITS));
 
-  GNUNET_assert (0 == gcry_pk_genkey (&key, gen_parms));
-  gcry_sexp_release (gen_parms);
+  GNUNET_assert (0 == gcry_pk_genkey (&key, gen_params));
+  gcry_sexp_release (gen_params);
 
   // get n and d of our publickey as MPI  
   tmp_sexp = gcry_sexp_find_token (key, "n", 0);