lib: fix some type mismatches and remove unneeded typecasts

Many of these castings are unneeded if we change the variables to work
better with each other.

Ref: https://github.com/curl/curl/pull/9823

Closes https://github.com/curl/curl/pull/9835

4 files changed, 15 insertions, 15 deletions

diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c
index da696ca2b..b7ef28cae 100644
--- a/packages/OS400/ccsidcurl.c
+++ b/packages/OS400/ccsidcurl.c
@@ -472,7 +472,7 @@ curl_version_info_ccsid(CURLversion stamp, unsigned int ccsid)
   memcpy((char *) id, (char *) p, sizeof(*p));
 
   if(id->protocols) {
-    int i = nproto * sizeof(id->protocols[0]);
+    i = nproto * sizeof(id->protocols[0]);
 
     id->protocols = (const char * const *) cp;
     memcpy(cp, (char *) p->protocols, i);
@@ -487,7 +487,7 @@ curl_version_info_ccsid(CURLversion stamp, unsigned int ccsid)
 
   for(i = 0; i < sizeof(charfields) / sizeof(charfields[0]); i++) {
     cpp = (const char **) ((char *) p + charfields[i]);
-    if (*cpp && convert_version_info_string(cpp, &cp, &n, ccsid))
+    if(*cpp && convert_version_info_string(cpp, &cp, &n, ccsid))
       return (curl_version_info_data *) NULL;
   }
 
diff --git a/packages/OS400/os400sys.c b/packages/OS400/os400sys.c
index 4219351ba..2cedc4fd7 100644
--- a/packages/OS400/os400sys.c
+++ b/packages/OS400/os400sys.c
@@ -745,7 +745,7 @@ OM_uint32
 Curl_gss_import_name_a(OM_uint32 *minor_status, gss_buffer_t in_name,
                        gss_OID in_name_type, gss_name_t *out_name)
 {
-  int rc;
+  OM_uint32 rc;
   unsigned int i;
   gss_buffer_desc in;
 
@@ -859,7 +859,7 @@ Curl_gss_delete_sec_context_a(OM_uint32 *minor_status,
                               gss_ctx_id_t *context_handle,
                               gss_buffer_t output_token)
 {
-  int rc;
+  OM_uint32 rc;
 
   rc = gss_delete_sec_context(minor_status, context_handle, output_token);
 
@@ -886,7 +886,7 @@ Curl_gss_delete_sec_context_a(OM_uint32 *minor_status,
 void *
 Curl_ldap_init_a(char *host, int port)
 {
-  unsigned int i;
+  size_t i;
   char *ehost;
   void *result;
 
diff --git a/packages/vms/curl_crtl_init.c b/packages/vms/curl_crtl_init.c
index 8b5da62d5..eedfa22a6 100644
--- a/packages/vms/curl_crtl_init.c
+++ b/packages/vms/curl_crtl_init.c
@@ -130,7 +130,7 @@ static int sys_trnlnm
 
     status = SYS$TRNLNM(&attr, &table_dsc, &name_dsc, 0, itlst);
 
-    if ($VMS_STATUS_SUCCESS(status)) {
+    if($VMS_STATUS_SUCCESS(status)) {
 
          /* Null terminate and return the string */
         /*--------------------------------------*/
@@ -192,7 +192,7 @@ static void set_feature_default(const char *name, int value)
 
     index = decc$feature_get_index(name);
 
-    if (index > 0)
+    if(index > 0)
         decc$feature_set_value (index, 0, value);
 }
 #endif
@@ -205,7 +205,7 @@ static void set_features(void)
 
     status = sys_trnlnm("GNV$UNIX_SHELL",
                         unix_shell_name, sizeof unix_shell_name -1);
-    if (!$VMS_STATUS_SUCCESS(status)) {
+    if(!$VMS_STATUS_SUCCESS(status)) {
         use_unix_settings = 0;
     }
 
@@ -249,7 +249,7 @@ static void set_features(void)
     /* Fix mv aa.bb aa  */
     set_feature_default ("DECC$RENAME_NO_INHERIT", ENABLE);
 
-    if (use_unix_settings) {
+    if(use_unix_settings) {
 
         /* POSIX requires that open files be able to be removed */
         set_feature_default ("DECC$ALLOW_REMOVE_OPEN_FILES", ENABLE);
diff --git a/packages/vms/report_openssl_version.c b/packages/vms/report_openssl_version.c
index 493969616..2f5f52781 100644
--- a/packages/vms/report_openssl_version.c
+++ b/packages/vms/report_openssl_version.c
@@ -49,7 +49,7 @@ void * libptr;
 const char * (*ssl_version)(int t);
 const char * version;
 
-   if (argc < 1) {
+   if(argc < 1) {
        puts("report_openssl_version filename");
        exit(1);
    }
@@ -57,16 +57,16 @@ const char * version;
    libptr = dlopen(argv[1], 0);
 
    ssl_version = (const char * (*)(int))dlsym(libptr, "SSLeay_version");
-   if ((void *)ssl_version == NULL) {
+   if(ssl_version == NULL) {
       ssl_version = (const char * (*)(int))dlsym(libptr, "ssleay_version");
-      if ((void *)ssl_version == NULL) {
+      if(ssl_version == NULL) {
          ssl_version = (const char * (*)(int))dlsym(libptr, "SSLEAY_VERSION");
       }
    }
 
    dlclose(libptr);
 
-   if ((void *)ssl_version == NULL) {
+   if(ssl_version == NULL) {
       puts("Unable to lookup version of OpenSSL");
       exit(1);
    }
@@ -76,7 +76,7 @@ const char * version;
    puts(version);
 
    /* Was a symbol argument given? */
-   if (argc > 1) {
+   if(argc > 1) {
       int status;
       struct dsc$descriptor_s symbol_dsc;
       struct dsc$descriptor_s value_dsc;
@@ -93,7 +93,7 @@ const char * version;
       value_dsc.dsc$b_class = DSC$K_CLASS_S;
 
       status = LIB$SET_SYMBOL(&symbol_dsc, &value_dsc, &table_type);
-      if (!$VMS_STATUS_SUCCESS(status)) {
+      if(!$VMS_STATUS_SUCCESS(status)) {
          exit(status);
       }
    }