diff --git a/src/driver/mdso_amain.c b/src/driver/mdso_amain.c
index ee02363..a3265cc 100644
--- a/src/driver/mdso_amain.c
+++ b/src/driver/mdso_amain.c
@@ -33,7 +33,7 @@ static const char * const mdso_ver_plain[6] = {
 		"",""
 };
 
-static ssize_t mdso_version(int fdout, struct mdso_driver_ctx * dctx)
+static ssize_t mdso_version(struct mdso_driver_ctx * dctx, int fdout)
 {
 	const struct mdso_source_version * verinfo;
 	const char * const * verclr;
@@ -82,7 +82,7 @@ int mdso_main(int argc, char ** argv, char ** envp, const struct mdso_fd_ctx * f
 			: MDSO_ERROR;
 
 	if (dctx->cctx->drvflags & MDSO_DRIVER_VERSION)
-		if ((mdso_version(fdout,dctx)) < 0)
+		if ((mdso_version(dctx,fdout)) < 0)
 			return mdso_exit(dctx,MDSO_ERROR);
 
 	if (dctx->cctx->implib)
diff --git a/src/driver/mdso_unit_ctx.c b/src/driver/mdso_unit_ctx.c
index 97c5041..c10a3ca 100644
--- a/src/driver/mdso_unit_ctx.c
+++ b/src/driver/mdso_unit_ctx.c
@@ -61,7 +61,7 @@ static int mdso_stdin_to_tmp(const struct mdso_driver_ctx * dctx)
 		return -1;
 	}
 
-	while (1) {
+	for (;;) {
 		ret = read(0,buf,sizeof(buf)-1);
 
 		while ((ret < 0) && (errno == EINTR))