* License.....: MIT
*/
-#ifdef DARWIN
+#ifdef __APPLE__
#include <stdio.h>
#endif
* tty
*/
-#ifdef LINUX
+#ifdef __linux__
static struct termios savemodes;
static int havemodes = 0;
}
#endif
-#if defined(DARWIN) || defined(__FreeBSD__)
+#if defined(__APPLE__) || defined(__FreeBSD__)
static struct termios savemodes;
static int havemodes = 0;
{
NvU32 pGpuCount;
- if (hm_NvAPI_EnumPhysicalGPUs (data.hm_nvapi, nvapiGPUHandle, &pGpuCount) != NVAPI_OK) return (0);
+ if (hm_NvAPI_EnumPhysicalGPUs (data.hm_nvapi, nvapiGPUHandle, &pGpuCount) != NVAPI_OK) return 0;
if (pGpuCount == 0)
{
log_info ("WARN: No NvAPI adapters found");
- return (0);
+ return 0;
}
return (pGpuCount);
{
log_info ("WARN: No NVML adapters found");
- return (0);
+ return 0;
}
return (pGpuCount);
{
if (fanpolicy == 1)
{
- NV_GPU_COOLER_LEVELS CoolerLevels = { 0 };
+ NV_GPU_COOLER_LEVELS CoolerLevels;
+
+ memset (&CoolerLevels, 0, sizeof (NV_GPU_COOLER_LEVELS));
CoolerLevels.Version = GPU_COOLER_LEVELS_VER | sizeof (NV_GPU_COOLER_LEVELS);
char *exec_path = (char *) mymalloc (exec_path_len);
- #ifdef LINUX
+ #ifdef __linux__
char tmp[32] = { 0 };
const int len = GetModuleFileName (NULL, exec_path, exec_path_len - 1);
- #elif DARWIN
+ #elif __APPLE__
uint size = exec_path_len;
myfree (buf);
}
-#ifdef DARWIN
+#ifdef __APPLE__
int pthread_setaffinity_np (pthread_t thread, size_t cpu_size, cpu_set_t *cpu_set)
{
int core;
}
#ifdef _WIN
- aff_mask |= 1 << (cpu_id - 1);
+ aff_mask |= 1u << (cpu_id - 1);
#elif _POSIX
CPU_SET ((cpu_id - 1), &cpuset);
#endif
while (n--)
{
if (s1->salt_buf[n] > s2->salt_buf[n]) return ( 1);
- if (s1->salt_buf[n] < s2->salt_buf[n]) return (-1);
+ if (s1->salt_buf[n] < s2->salt_buf[n]) return -1;
}
n = 8;
while (n--)
{
if (s1->salt_buf_pc[n] > s2->salt_buf_pc[n]) return ( 1);
- if (s1->salt_buf_pc[n] < s2->salt_buf_pc[n]) return (-1);
+ if (s1->salt_buf_pc[n] < s2->salt_buf_pc[n]) return -1;
}
- return (0);
+ return 0;
}
int sort_by_salt_buf (const void *v1, const void *v2)
while (n--)
{
if (s1->salt_buf[n] > s2->salt_buf[n]) return ( 1);
- if (s1->salt_buf[n] < s2->salt_buf[n]) return (-1);
+ if (s1->salt_buf[n] < s2->salt_buf[n]) return -1;
}
return 0;
while (n--)
{
if (s1->salt_buf[n] > s2->salt_buf[n]) return ( 1);
- if (s1->salt_buf[n] < s2->salt_buf[n]) return (-1);
+ if (s1->salt_buf[n] < s2->salt_buf[n]) return -1;
}
/* original code, seems buggy since salt_len can be very big (had a case with 131 len)
also it thinks salt_buf[x] is a char but its a uint so salt_len should be / 4
if (s1->salt_len > s2->salt_len) return ( 1);
- if (s1->salt_len < s2->salt_len) return (-1);
+ if (s1->salt_len < s2->salt_len) return -1;
uint n = s1->salt_len;
while (n--)
{
if (s1->salt_buf[n] > s2->salt_buf[n]) return ( 1);
- if (s1->salt_buf[n] < s2->salt_buf[n]) return (-1);
+ if (s1->salt_buf[n] < s2->salt_buf[n]) return -1;
}
*/
while (n--)
{
if (s1->salt_buf[n] > s2->salt_buf[n]) return ( 1);
- if (s1->salt_buf[n] < s2->salt_buf[n]) return (-1);
+ if (s1->salt_buf[n] < s2->salt_buf[n]) return -1;
}
return 0;
dictstat_t *d1 = (dictstat_t *) s1;
dictstat_t *d2 = (dictstat_t *) s2;
- #ifdef _LINUX
+ #ifdef __linux__
d2->stat.st_atim = d1->stat.st_atim;
#else
d2->stat.st_atime = d1->stat.st_atime;
while (n--)
{
if (d1[n] > d2[n]) return ( 1);
- if (d1[n] < d2[n]) return (-1);
+ if (d1[n] < d2[n]) return -1;
}
- return (0);
+ return 0;
}
int sort_by_digest_4_4 (const void *v1, const void *v2)
while (n--)
{
if (d1[n] > d2[n]) return ( 1);
- if (d1[n] < d2[n]) return (-1);
+ if (d1[n] < d2[n]) return -1;
}
- return (0);
+ return 0;
}
int sort_by_digest_4_5 (const void *v1, const void *v2)
while (n--)
{
if (d1[n] > d2[n]) return ( 1);
- if (d1[n] < d2[n]) return (-1);
+ if (d1[n] < d2[n]) return -1;
}
- return (0);
+ return 0;
}
int sort_by_digest_4_6 (const void *v1, const void *v2)
while (n--)
{
if (d1[n] > d2[n]) return ( 1);
- if (d1[n] < d2[n]) return (-1);
+ if (d1[n] < d2[n]) return -1;
}
- return (0);
+ return 0;
}
int sort_by_digest_4_8 (const void *v1, const void *v2)
while (n--)
{
if (d1[n] > d2[n]) return ( 1);
- if (d1[n] < d2[n]) return (-1);
+ if (d1[n] < d2[n]) return -1;
}
- return (0);
+ return 0;
}
int sort_by_digest_4_16 (const void *v1, const void *v2)
while (n--)
{
if (d1[n] > d2[n]) return ( 1);
- if (d1[n] < d2[n]) return (-1);
+ if (d1[n] < d2[n]) return -1;
}
- return (0);
+ return 0;
}
int sort_by_digest_4_32 (const void *v1, const void *v2)
while (n--)
{
if (d1[n] > d2[n]) return ( 1);
- if (d1[n] < d2[n]) return (-1);
+ if (d1[n] < d2[n]) return -1;
}
- return (0);
+ return 0;
}
int sort_by_digest_4_64 (const void *v1, const void *v2)
while (n--)
{
if (d1[n] > d2[n]) return ( 1);
- if (d1[n] < d2[n]) return (-1);
+ if (d1[n] < d2[n]) return -1;
}
- return (0);
+ return 0;
}
int sort_by_digest_8_8 (const void *v1, const void *v2)
while (n--)
{
if (d1[n] > d2[n]) return ( 1);
- if (d1[n] < d2[n]) return (-1);
+ if (d1[n] < d2[n]) return -1;
}
- return (0);
+ return 0;
}
int sort_by_digest_8_16 (const void *v1, const void *v2)
while (n--)
{
if (d1[n] > d2[n]) return ( 1);
- if (d1[n] < d2[n]) return (-1);
+ if (d1[n] < d2[n]) return -1;
}
- return (0);
+ return 0;
}
int sort_by_digest_8_25 (const void *v1, const void *v2)
while (n--)
{
if (d1[n] > d2[n]) return ( 1);
- if (d1[n] < d2[n]) return (-1);
+ if (d1[n] < d2[n]) return -1;
}
- return (0);
+ return 0;
}
int sort_by_digest_p0p1 (const void *v1, const void *v2)
const uint dgst_pos3 = data.dgst_pos3;
if (d1[dgst_pos3] > d2[dgst_pos3]) return ( 1);
- if (d1[dgst_pos3] < d2[dgst_pos3]) return (-1);
+ if (d1[dgst_pos3] < d2[dgst_pos3]) return -1;
if (d1[dgst_pos2] > d2[dgst_pos2]) return ( 1);
- if (d1[dgst_pos2] < d2[dgst_pos2]) return (-1);
+ if (d1[dgst_pos2] < d2[dgst_pos2]) return -1;
if (d1[dgst_pos1] > d2[dgst_pos1]) return ( 1);
- if (d1[dgst_pos1] < d2[dgst_pos1]) return (-1);
+ if (d1[dgst_pos1] < d2[dgst_pos1]) return -1;
if (d1[dgst_pos0] > d2[dgst_pos0]) return ( 1);
- if (d1[dgst_pos0] < d2[dgst_pos0]) return (-1);
+ if (d1[dgst_pos0] < d2[dgst_pos0]) return -1;
- return (0);
+ return 0;
}
int sort_by_tuning_db_alias (const void *v1, const void *v2)
#endif
}
- fputc ('\n', out_fp);
+ fputs (EOL, out_fp);
}
void handle_show_request (pot_t *pot, uint pot_cnt, char *input_buf, int input_len, hash_t *hashes_buf, int (*sort_by_pot) (const void *, const void *), FILE *out_fp)
exit (-1);
}
- opencl_platforms_filter |= 1 << (platform - 1);
+ opencl_platforms_filter |= 1u << (platform - 1);
} while ((next = strtok (NULL, ",")) != NULL);
exit (-1);
}
- devices_filter |= 1 << (device_id - 1);
+ devices_filter |= 1u << (device_id - 1);
} while ((next = strtok (NULL, ",")) != NULL);
exit (-1);
}
- device_types_filter |= 1 << device_type;
+ device_types_filter |= 1u << device_type;
} while ((next = strtok (NULL, ",")) != NULL);
if ((d = opendir (tmp_path)) != NULL)
{
- #ifdef DARWIN
+ #ifdef __APPLE__
+
struct dirent e;
- for (;;) {
+ for (;;)
+ {
memset (&e, 0, sizeof (e));
+
struct dirent *de = NULL;
if (readdir_r (d, &e, &de) != 0)
}
if (de == NULL) break;
+
#else
+
struct dirent *de;
while ((de = readdir (d)) != NULL)
{
+
#endif
+
if ((strcmp (de->d_name, ".") == 0) || (strcmp (de->d_name, "..") == 0)) continue;
int path_size = strlen (tmp_path) + 1 + strlen (de->d_name);
uint len = 4096;
- uint digest_buf[64] = { 0 };
+ u8 datax[256] = { 0 };
- u64 *digest_buf64 = (u64 *) digest_buf;
+ u64 *digest_buf64 = (u64 *) datax;
+ u32 *digest_buf = (u32 *) datax;
char *digests_buf_ptr = (char *) data.digests_buf;
char *iter_pos = input_buf + 4;
- salt->salt_iter = 1 << atoi (iter_pos);
+ salt->salt_iter = 1u << atoi (iter_pos);
char *salt_pos = strchr (iter_pos, '$');
char *iter_pos = input_buf + 3;
- uint salt_iter = 1 << itoa64_to_int (iter_pos[0]);
+ uint salt_iter = 1u << itoa64_to_int (iter_pos[0]);
if (salt_iter > 0x80000000) return (PARSER_SALT_ITERATION);
salt->salt_sign[0] = atoi (salt_iter);
- salt->salt_iter = (1 << atoi (salt_iter)) - 1;
+ salt->salt_iter = (1u << atoi (salt_iter)) - 1;
hash_pos++;
salt->salt_sign[0] = atoi (salt_iter);
- salt->salt_iter = (1 << atoi (salt_iter)) - 1;
+ salt->salt_iter = (1u << atoi (salt_iter)) - 1;
hash_pos++;
salt->salt_sign[0] = atoi (salt_iter);
- salt->salt_iter = (1 << atoi (salt_iter)) - 1;
+ salt->salt_iter = (1u << atoi (salt_iter)) - 1;
hash_pos++;
char *iter_pos = input_buf + 3;
- uint salt_iter = 1 << itoa64_to_int (iter_pos[0]);
+ uint salt_iter = 1u << itoa64_to_int (iter_pos[0]);
if (salt_iter > 0x80000000) return (PARSER_SALT_ITERATION);
int enc_md = atoi (enc_md_pos);
- if (enc_md != 1) return (PARSER_SALT_VALUE);
+ if ((enc_md != 0) && (enc_md != 1)) return (PARSER_SALT_VALUE);
const uint id_len = atoi (id_len_pos);
const uint u_len = atoi (u_len_pos);
salt->salt_sign[0] = iter;
- salt->salt_iter = 1 << iter;
+ salt->salt_iter = 1u << iter;
/**
* digest
salt->salt_sign[0] = iterations;
- salt->salt_iter = ((1 << iterations) + 32) - 1;
+ salt->salt_iter = ((1u << iterations) + 32) - 1;
/**
* digest buf
break;
case RULE_OP_MANGLE_PURGECHAR:
- return (-1);
+ SET_NAME (rule, rule_buf[rule_pos]);
+ SET_P0 (rule, rule_buf[rule_pos]);
break;
case RULE_OP_MANGLE_TOGGLECASE_REC:
- return (-1);
+ return -1;
break;
case RULE_OP_MANGLE_DUPECHAR_FIRST:
break;
default:
- return (-1);
+ return -1;
break;
}
}
- if (rule_pos < rule_len) return (-1);
+ if (rule_pos < rule_len) return -1;
- return (0);
+ return 0;
}
int kernel_rule_to_cpu_rule (char *rule_buf, kernel_rule_t *rule)
break;
case RULE_OP_MANGLE_PURGECHAR:
- return (-1);
+ rule_buf[rule_pos] = rule_cmd;
+ GET_P0 (rule);
break;
case RULE_OP_MANGLE_TOGGLECASE_REC:
- return (-1);
+ return -1;
break;
case RULE_OP_MANGLE_DUPECHAR_FIRST:
break;
default:
- return (-1);
+ return -1;
break;
}
}
return rule_pos;
}
- return (-1);
+ return -1;
}
/**