diff --git a/.mailmap b/.mailmap
index 5fe41e1574..a8f0cd716f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -96,3 +96,4 @@ Oliver Roberts <oliver@futaura.co.uk>
 opensignature on github <antonio@piumarossa.it>
 Cering on github <gfypm@qq.com>
 a1346054 on github <36859588+a1346054@users.noreply.github.com>
+zhanghu on xiaomi <zhanghu6@xiaomi.com>
diff --git a/lib/formdata.c b/lib/formdata.c
index f5ed3653df..3128f495b1 100644
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -251,8 +251,10 @@ CURLFORMcode FormAdd(struct curl_httppost **httppost,
       }
     }
     else {
-      /* This is not array-state, get next option */
-      option = va_arg(params, CURLformoption);
+      /* This is not array-state, get next option. This gets an 'int' with
+         va_arg() because CURLformoption might be a smaller type than int and
+         might cause compiler warnings and wrong behavior. */
+      option = va_arg(params, int);
       if(CURLFORM_END == option)
         break;
     }