Merge branch 'main' into coverity

baresip · Mar 29, 2024 · 0a60458 · 0a60458
2 parents 4d51236 + b4f0885
commit 0a60458
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/include/re_httpauth.h b/include/re_httpauth.h
@@ -113,8 +113,8 @@ int httpauth_digest_response_print(struct re_printf *pf,
 	const struct httpauth_digest_enc_resp *resp);
 int httpauth_digest_response_set_cnonce(struct httpauth_digest_enc_resp *resp,
 	const struct httpauth_digest_chall *chall, const struct pl *method,
-	const char *user,	const char *passwd, const char *entitybody,
-	const uint32_t cnonce, const uint32_t nc_);
+	const char *user, const char *passwd, const char *entitybody,
+	uint32_t cnonce, uint32_t nonce_cnt);
 int httpauth_digest_response(struct httpauth_digest_enc_resp **presp,
 	const struct httpauth_digest_chall *chall, const struct pl *method,
 	const char *uri, const char *user, const char *passwd, const char *qop,

diff --git a/include/re_main.h b/include/re_main.h
@@ -36,8 +36,8 @@ typedef void (fd_h)(int flags, void *arg);
 typedef void (re_signal_h)(int sig);
 
 
-int   fd_listen(struct re_fhs **fhs, re_sock_t fd, int flags, fd_h *fh,
-		void *arg);
+int   fd_listen(struct re_fhs **fhsp, re_sock_t fd, int flags, fd_h *fh,
+	void *arg);
 struct re_fhs *fd_close(struct re_fhs *fhs);
 int   fd_setsize(int maxfds);
 

diff --git a/src/httpauth/digest.c b/src/httpauth/digest.c
@@ -1000,13 +1000,13 @@ int httpauth_digest_response_print(struct re_printf *pf,
 int httpauth_digest_response_set_cnonce(struct httpauth_digest_enc_resp *resp,
 	const struct httpauth_digest_chall *chall, const struct pl *method,
 	const char *user,	const char *passwd, const char *entitybody,
-	uint32_t cnonce, uint32_t nonce_counter)
+	uint32_t cnonce, uint32_t nonce_cnt)
 {
 	if (!resp || !chall || !method || !passwd)
 		return EINVAL;
 
 	resp->cnonce = cnonce;
-	resp->nc = nonce_counter;
+	resp->nc = nonce_cnt;
 
 	return digest_response(resp, chall, method,
 		user, passwd, entitybody);

diff --git a/src/main/main.c b/src/main/main.c
@@ -569,7 +569,7 @@ static int poll_setup(struct re *re)
  *
  * @return 0 if success, otherwise errorcode
  */
-int fd_listen(struct re_fhs **fhsp, re_sock_t fd, int flags, fd_h fh,
+int fd_listen(struct re_fhs **fhsp, re_sock_t fd, int flags, fd_h *fh,
 	      void *arg)
 {
 	struct re *re = re_get();