From fb75164126a04703da807aa5947c52fa3b6c1306 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 3 Aug 2019 18:34:38 -0700 Subject: [PATCH] Run through Clang's google-readability-casting Removes casts where the type is identical. --- src/backend.c | 34 +++++++++++++++++----------------- src/brain.c | 2 +- src/dispatch.c | 6 +++--- src/filehandling.c | 4 ++-- src/potfile.c | 2 +- src/shared.c | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/backend.c b/src/backend.c index b0469e8d7..c3d0d1ec2 100644 --- a/src/backend.c +++ b/src/backend.c @@ -449,7 +449,7 @@ static bool read_kernel_binary (hashcat_ctx_t *hashcat_ctx, const char *kernel_f hc_fclose (&fp); - if (num_read != (size_t) klen) + if (num_read != klen) { event_log_error (hashcat_ctx, "%s: %s", kernel_file, strerror (errno)); @@ -473,7 +473,7 @@ static bool read_kernel_binary (hashcat_ctx_t *hashcat_ctx, const char *kernel_f klen += extra_len; } - kernel_lengths[0] = (size_t) klen; + kernel_lengths[0] = klen; kernel_sources[0] = buf; } @@ -2420,7 +2420,7 @@ int hc_clCreateProgramWithBinary (hashcat_ctx_t *hashcat_ctx, cl_context context cl_int CL_err; - *program = ocl->clCreateProgramWithBinary (context, num_devices, device_list, lengths, (const unsigned char **) binaries, binary_status, &CL_err); + *program = ocl->clCreateProgramWithBinary (context, num_devices, device_list, lengths, binaries, binary_status, &CL_err); if (CL_err != CL_SUCCESS) { @@ -4110,7 +4110,7 @@ int run_cracker (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, co if (hashconfig->attack_exec == ATTACK_EXEC_INSIDE_KERNEL) innerloop_step = device_param->kernel_loops; else innerloop_step = 1; - if (user_options_extra->attack_kern == ATTACK_KERN_STRAIGHT) innerloop_cnt = (u32) straight_ctx->kernel_rules_cnt; + if (user_options_extra->attack_kern == ATTACK_KERN_STRAIGHT) innerloop_cnt = straight_ctx->kernel_rules_cnt; else if (user_options_extra->attack_kern == ATTACK_KERN_COMBI) innerloop_cnt = (u32) combinator_ctx->combs_cnt; else if (user_options_extra->attack_kern == ATTACK_KERN_BF) innerloop_cnt = (u32) mask_ctx->bfs_cnt; } @@ -4137,7 +4137,7 @@ int run_cracker (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, co device_param->innerloop_pos = innerloop_pos; device_param->innerloop_left = innerloop_left; - device_param->kernel_params_buf32[30] = (u32) innerloop_left; + device_param->kernel_params_buf32[30] = innerloop_left; device_param->outerloop_multi = (double) innerloop_cnt / (double) (innerloop_pos + innerloop_left); @@ -4145,7 +4145,7 @@ int run_cracker (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, co if (hashes->salts_shown[salt_pos] == 1) { - status_ctx->words_progress_done[salt_pos] += (u64) pws_cnt * innerloop_left; + status_ctx->words_progress_done[salt_pos] += pws_cnt * innerloop_left; continue; } @@ -4484,7 +4484,7 @@ int run_cracker (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, co if (status_ctx->run_thread_level2 == true) { - const u64 perf_sum_all = (u64) pws_cnt * innerloop_left; + const u64 perf_sum_all = pws_cnt * innerloop_left; const double speed_msec = hc_timer_get (device_param->timer_speed); @@ -6796,7 +6796,7 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx) u64 size_plains = (u64) hashes->digests_cnt * sizeof (plain_t); u64 size_salts = (u64) hashes->salts_cnt * sizeof (salt_t); - u64 size_esalts = (u64) hashes->digests_cnt * (u64) hashconfig->esalt_size; + u64 size_esalts = (u64) hashes->digests_cnt * hashconfig->esalt_size; u64 size_shown = (u64) hashes->digests_cnt * sizeof (u32); u64 size_digests = (u64) hashes->digests_cnt * (u64) hashconfig->dgst_size; @@ -6842,7 +6842,7 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx) // kern type - u32 kern_type = (u32) hashconfig->kern_type; + u32 kern_type = hashconfig->kern_type; if (module_ctx->module_kern_type_dynamic != MODULE_DEFAULT) { @@ -9288,13 +9288,13 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx) // size_pws - size_pws = (u64) kernel_power_max * sizeof (pw_t); + size_pws = kernel_power_max * sizeof (pw_t); size_pws_amp = (hashconfig->attack_exec == ATTACK_EXEC_INSIDE_KERNEL) ? 1 : size_pws; // size_pws_comp - size_pws_comp = (u64) kernel_power_max * (sizeof (u32) * 64); + size_pws_comp = kernel_power_max * (sizeof (u32) * 64); // size_pws_idx @@ -9302,28 +9302,28 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx) // size_tmps - size_tmps = (u64) kernel_power_max * (hashconfig->tmp_size + hashconfig->extra_tmp_size); + size_tmps = kernel_power_max * (hashconfig->tmp_size + hashconfig->extra_tmp_size); // size_hooks - size_hooks = (u64) kernel_power_max * hashconfig->hook_size; + size_hooks = kernel_power_max * hashconfig->hook_size; #ifdef WITH_BRAIN // size_brains - size_brain_link_in = (u64) kernel_power_max * 1; - size_brain_link_out = (u64) kernel_power_max * 8; + size_brain_link_in = kernel_power_max * 1; + size_brain_link_out = kernel_power_max * 8; #endif if (user_options->slow_candidates == true) { // size_pws_pre - size_pws_pre = (u64) kernel_power_max * sizeof (pw_pre_t); + size_pws_pre = kernel_power_max * sizeof (pw_pre_t); // size_pws_base - size_pws_base = (u64) kernel_power_max * sizeof (pw_pre_t); + size_pws_base = kernel_power_max * sizeof (pw_pre_t); } // now check if all device-memory sizes which depend on the kernel_accel_max amplifier are within its boundaries diff --git a/src/brain.c b/src/brain.c index ce3e629b3..02c20b78e 100644 --- a/src/brain.c +++ b/src/brain.c @@ -934,7 +934,7 @@ bool brain_client_connect (hc_device_param_t *device_param, const status_ctx_t * snprintf (port_str, sizeof (port_str), "%i", port); - const char *host_real = (host == NULL) ? "127.0.0.1" : (const char *) host; + const char *host_real = (host == NULL) ? "127.0.0.1" : host; bool connected = false; diff --git a/src/dispatch.c b/src/dispatch.c index 9574361a7..b2e936235 100644 --- a/src/dispatch.c +++ b/src/dispatch.c @@ -541,7 +541,7 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param) brain_client_generate_hash ((u64 *) hash, (const char *) extra_info_straight.out_buf, extra_info_straight.out_len); - u32 *ptr = (u32 *) device_param->brain_link_out_buf; + u32 *ptr = device_param->brain_link_out_buf; ptr[(device_param->pws_pre_cnt * 2) + 0] = hash[0]; ptr[(device_param->pws_pre_cnt * 2) + 1] = hash[1]; @@ -853,7 +853,7 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param) brain_client_generate_hash ((u64 *) hash, (const char *) extra_info_combi.out_buf, extra_info_combi.out_len); - u32 *ptr = (u32 *) device_param->brain_link_out_buf; + u32 *ptr = device_param->brain_link_out_buf; ptr[(device_param->pws_pre_cnt * 2) + 0] = hash[0]; ptr[(device_param->pws_pre_cnt * 2) + 1] = hash[1]; @@ -1108,7 +1108,7 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param) brain_client_generate_hash ((u64 *) hash, (const char *) extra_info_mask.out_buf, extra_info_mask.out_len); - u32 *ptr = (u32 *) device_param->brain_link_out_buf; + u32 *ptr = device_param->brain_link_out_buf; ptr[(device_param->pws_pre_cnt * 2) + 0] = hash[0]; ptr[(device_param->pws_pre_cnt * 2) + 1] = hash[1]; diff --git a/src/filehandling.c b/src/filehandling.c index 55cfc1f6a..921e7e0ed 100644 --- a/src/filehandling.c +++ b/src/filehandling.c @@ -168,7 +168,7 @@ int hc_fseek (HCFILE *fp, off_t offset, int whence) if (fp->is_gzip) { - r = gzseek (fp->gfp, (z_off_t) offset, whence); + r = gzseek (fp->gfp, offset, whence); } else if (fp->is_zip) { @@ -371,7 +371,7 @@ int hc_fscanf (HCFILE *fp, const char *format, void *ptr) return -1; } - sscanf (b, format, (void *) ptr); + sscanf (b, format, ptr); hcfree (buf); diff --git a/src/potfile.c b/src/potfile.c index efc552a48..b0726107a 100644 --- a/src/potfile.c +++ b/src/potfile.c @@ -69,7 +69,7 @@ int sort_pot_tree_by_hash (const void *v1, const void *v2) const hash_t *h1 = (const hash_t *) t1->nodes->hash_buf; const hash_t *h2 = (const hash_t *) t2->nodes->hash_buf; - hashconfig_t *hc = (hashconfig_t *) t1->hashconfig; // is same as t2->hashconfig + hashconfig_t *hc = t1->hashconfig; // is same as t2->hashconfig return sort_by_hash (h1, h2, hc); } diff --git a/src/shared.c b/src/shared.c index f9d3a01ab..67134ef25 100644 --- a/src/shared.c +++ b/src/shared.c @@ -1147,7 +1147,7 @@ bool generic_salt_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, const u8 if (in_len < (int) (((hashconfig->salt_min * 8) / 6) + 0)) return false; if (in_len > (int) (((hashconfig->salt_max * 8) / 6) + 3)) return false; - tmp_len = base64_decode (base64_to_int, (const u8 *) in_buf, in_len, tmp_u8); + tmp_len = base64_decode (base64_to_int, in_buf, in_len, tmp_u8); } else {