mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-12-01 02:49:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use easily identifiable type

Browse source
This commit is contained in:
Arun Prakash Jana 2021-06-19 18:39:35 +05:30
parent 8f3785f2e5
commit 3e91c2c977
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/nnn.c
View file

@ -245,7 +245,7 @@
typedef unsigned int uint_t; typedef unsigned int uint_t;
typedef unsigned char uchar_t; typedef unsigned char uchar_t;
typedef unsigned short ushort_t; typedef unsigned short ushort_t;
typedef unsigned long long ulong_t; typedef unsigned long long ullong_t;
/* STRUCTURES */ /* STRUCTURES */
@ -257,9 +257,9 @@ typedef struct entry {
mode_t mode; /* 4 bytes */ mode_t mode; /* 4 bytes */
off_t size; /* 8 bytes */ off_t size; /* 8 bytes */
struct { struct {
ulong_t blocks : 40; /* 5 bytes (enough for 512 TiB in 512B blocks allocated) */ ullong_t blocks : 40; /* 5 bytes (enough for 512 TiB in 512B blocks allocated) */
ulong_t nlen : 16; /* 2 bytes (length of file name) */ ullong_t nlen : 16; /* 2 bytes (length of file name) */
ulong_t flags : 8; /* 1 byte (flags specific to the file) */ ullong_t flags : 8; /* 1 byte (flags specific to the file) */
}; };
#ifndef NOUG #ifndef NOUG
uid_t uid; /* 4 bytes */ uid_t uid; /* 4 bytes */
@ -429,7 +429,7 @@ static char *mark;
static char *hfifopath; /* FIFO used in hover (NNN_FIFO) */ static char *hfifopath; /* FIFO used in hover (NNN_FIFO) */
static char *efifopath; /* FIFO used in explorer mode (-X) */ static char *efifopath; /* FIFO used in explorer mode (-X) */
#endif #endif
static unsigned long long *ihashbmp; static ullong_t *ihashbmp;
static struct entry *pdents; static struct entry *pdents;
static blkcnt_t dir_blocks; static blkcnt_t dir_blocks;
static kv *bookmark; static kv *bookmark;
@ -454,9 +454,9 @@ static int threadbmp = -1; /* Has 1 in the bit position for idle threads */
static volatile int active_threads; static volatile int active_threads;
static pthread_mutex_t running_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t running_mutex = PTHREAD_MUTEX_INITIALIZER;
static pthread_mutex_t hardlink_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t hardlink_mutex = PTHREAD_MUTEX_INITIALIZER;
static ulong_t *core_files; static ullong_t *core_files;
static blkcnt_t *core_blocks; static blkcnt_t *core_blocks;
static ulong_t num_files; static ullong_t num_files;
typedef struct { typedef struct {
char path[PATH_MAX]; char path[PATH_MAX];
@ -883,7 +883,7 @@ static bool test_set_bit(uint_t nr)
nr &= HASH_BITS; nr &= HASH_BITS;
pthread_mutex_lock(&hardlink_mutex); pthread_mutex_lock(&hardlink_mutex);
ulong_t *m = ((ulong_t *)ihashbmp) + (nr >> 6); ullong_t *m = ((ullong_t *)ihashbmp) + (nr >> 6);
if (*m & (1 << (nr & 63))) { if (*m & (1 << (nr & 63))) {
pthread_mutex_unlock(&hardlink_mutex); pthread_mutex_unlock(&hardlink_mutex);
@ -5026,7 +5026,7 @@ static void *du_thread(void *p_data)
{ {
thread_data *pdata = (thread_data *)p_data; thread_data *pdata = (thread_data *)p_data;
char *path[2] = {pdata->path, NULL}; char *path[2] = {pdata->path, NULL};
ulong_t tfiles = 0; ullong_t tfiles = 0;
blkcnt_t tblocks = 0; blkcnt_t tblocks = 0;
struct stat *sb; struct stat *sb;
FTS *tree = fts_open(path, FTS_PHYSICAL | FTS_XDEV | FTS_NOCHDIR, 0); FTS *tree = fts_open(path, FTS_PHYSICAL | FTS_XDEV | FTS_NOCHDIR, 0);
@ -5104,7 +5104,7 @@ static void prep_threads(void)
core_blocks = calloc(NUM_DU_THREADS, sizeof(blkcnt_t)); core_blocks = calloc(NUM_DU_THREADS, sizeof(blkcnt_t));
core_data = calloc(NUM_DU_THREADS, sizeof(thread_data)); core_data = calloc(NUM_DU_THREADS, sizeof(thread_data));
core_files = calloc(NUM_DU_THREADS, sizeof(ulong_t)); core_files = calloc(NUM_DU_THREADS, sizeof(ullong_t));
#ifndef __APPLE__ #ifndef __APPLE__
/* Increase current open file descriptor limit */ /* Increase current open file descriptor limit */
@ -5114,7 +5114,7 @@ static void prep_threads(void)
} else { } else {
memset(core_blocks, 0, NUM_DU_THREADS * sizeof(blkcnt_t)); memset(core_blocks, 0, NUM_DU_THREADS * sizeof(blkcnt_t));
memset(core_data, 0, NUM_DU_THREADS * sizeof(thread_data)); memset(core_data, 0, NUM_DU_THREADS * sizeof(thread_data));
memset(core_files, 0, NUM_DU_THREADS * sizeof(ulong_t)); memset(core_files, 0, NUM_DU_THREADS * sizeof(ullong_t));
} }
} }
@ -5803,7 +5803,7 @@ static void statusbar(char *path)
printw("%cu:%s free:%s files:%llu %lluB %s\n", printw("%cu:%s free:%s files:%llu %lluB %s\n",
(cfg.apparentsz ? 'a' : 'd'), buf, coolsize(get_fs_info(path, FREE)), (cfg.apparentsz ? 'a' : 'd'), buf, coolsize(get_fs_info(path, FREE)),
num_files, (ulong_t)pent->blocks << blk_shift, ptr); num_files, (ullong_t)pent->blocks << blk_shift, ptr);
} else { /* light or detail mode */ } else { /* light or detail mode */
char sort[] = "\0\0\0\0\0"; char sort[] = "\0\0\0\0\0";
@ -7597,7 +7597,7 @@ static void check_key_collision(void)
int key; int key;
bool bitmap[KEY_MAX] = {FALSE}; bool bitmap[KEY_MAX] = {FALSE};
for (ulong_t i = 0; i < sizeof(bindings) / sizeof(struct key); ++i) { for (ullong_t i = 0; i < sizeof(bindings) / sizeof(struct key); ++i) {
key = bindings[i].sym; key = bindings[i].sym;
if (bitmap[key]) if (bitmap[key])