Do not store result of binary operation in a bool

8 years ago · 2f398becfb
parent 1321cbdcf8
commit 2f398becfb
3 changed files with 3 additions and 3 deletions
--- a/src/outfile.c
+++ b/src/outfile.c
@ -375,7 +375,7 @@ int outfile_write (hashcat_ctx_t *hashcat_ctx, const char *out_buf, const unsign

  if (outfile_ctx->outfile_format & OUTFILE_FMT_PLAIN)
  {
-    const bool always_ascii = (hashconfig->hash_type & OPTS_TYPE_PT_ALWAYS_ASCII);
+    const bool always_ascii = (hashconfig->hash_type & OPTS_TYPE_PT_ALWAYS_ASCII) ? true : false;

    if ((user_options->outfile_autohex == true) && (need_hexify (plain_ptr, plain_len, always_ascii) == true))
    {
--- a/src/potfile.c
+++ b/src/potfile.c
@ -223,7 +223,7 @@ void potfile_write_append (hashcat_ctx_t *hashcat_ctx, const char *out_buf, u8 *

  if (1)
  {
-    const bool always_ascii = (hashconfig->hash_type & OPTS_TYPE_PT_ALWAYS_ASCII);
+    const bool always_ascii = (hashconfig->hash_type & OPTS_TYPE_PT_ALWAYS_ASCII) ? true : false;

    if ((user_options->outfile_autohex == true) && (need_hexify (plain_ptr, plain_len, always_ascii) == true))
    {
--- a/src/status.c
+++ b/src/status.c
@ -737,7 +737,7 @@ char *status_get_input_candidates_dev (const hashcat_ctx_t *hashcat_ctx, const i
  build_plain ((hashcat_ctx_t *) hashcat_ctx, device_param, &plain1, plain_buf1, &plain_len1);
  build_plain ((hashcat_ctx_t *) hashcat_ctx, device_param, &plain2, plain_buf2, &plain_len2);

-  const bool always_ascii = (hashconfig->hash_type & OPTS_TYPE_PT_ALWAYS_ASCII);
+  const bool always_ascii = (hashconfig->hash_type & OPTS_TYPE_PT_ALWAYS_ASCII) ? true : false;

  const bool need_hex1 = need_hexify (plain_ptr1, plain_len1, always_ascii);
  const bool need_hex2 = need_hexify (plain_ptr2, plain_len2, always_ascii);