Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gnu11 #368

Merged
merged 1 commit into from
Mar 1, 2025
Merged

Gnu11 #368

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ VERSION ?= $(shell git describe --abbrev=4 --dirty --always --tags;)
IS_RELEASE ?= $(if $(filter $(shell git rev-list $(shell git describe --abbrev=0 --tags --exclude '*dev';)..HEAD --count;),0),1,0)

CC ?= gcc
CFLAGS ?= -Wall -ggdb --std=c23 -MMD
CFLAGS ?= -Wall -ggdb -std=gnu11 -Werror=strict-prototypes -MMD
PKG_CONFIG ?= pkg-config

MANPAGES=duperemove.8 btrfs-extent-same.8 hashstats.8 show-shared-extents.8
Expand Down
4 changes: 2 additions & 2 deletions dbfile.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ void dbfile_close_handle(struct dbhandle *db);
*/
struct dbhandle *dbfile_open_handle_thread(char *filename, struct threads_pool *pool);

void dbfile_lock();
void dbfile_unlock();
void dbfile_lock(void);
void dbfile_unlock(void);

struct dbfile_config {
unsigned int blocksize;
Expand Down
6 changes: 3 additions & 3 deletions duperemove.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ static int rm_db_files(int numfiles, char **files)
return 0;
}

static void print_version()
static void print_version(void)
{
char *s = NULL;
#ifdef DEBUG_BUILD
Expand Down Expand Up @@ -206,7 +206,7 @@ enum {
BATCH_SIZE_OPTION,
};

static int process_fdupes()
static int process_fdupes(void)
{
int ret = 0;
_cleanup_(freep) char *path = NULL;
Expand Down Expand Up @@ -285,7 +285,7 @@ static int scan_files_from_cmdline(int numfiles, char **files, struct dbhandle *
return 0;
}

static void help()
static void help(void)
{
execlp("man", "man", "8", "duperemove", NULL);
}
Expand Down
4 changes: 2 additions & 2 deletions file_scan.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ struct file_to_scan {

int add_exclude_pattern(const char *pattern);

void filescan_init();
void filescan_free();
void filescan_init(void);
void filescan_free(void);

void add_file_fdupes(char *path);
#endif /* __FILE_SCAN_H__ */
2 changes: 1 addition & 1 deletion hashstats.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ static void print_file_info(char *fname, struct dbfile_config *cfg,
stats->num_files, stats->num_b_hashes, stats->num_e_hashes);
}

static void version()
static void version(void)
{
printf("hashstats %s\n", VERSTRING);
}
Expand Down
1 change: 1 addition & 0 deletions list.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ struct hlist_node {

#define LIST_HEAD_INIT(name) { &(name), &(name) }

#undef LIST_HEAD // <bsd/sys/queue.h>
#define LIST_HEAD(name) \
struct list_head name = LIST_HEAD_INIT(name)

Expand Down
10 changes: 5 additions & 5 deletions progress.c
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ static void *print_progress(void)
return NULL;
}

static void *pscan_progress_thread(void *)
static void *pscan_progress_thread(void * p)
{
struct winsize w;
do {
Expand Down Expand Up @@ -215,7 +215,7 @@ struct pscan_thread *pscan_register_thread(pid_t tid)
return tprogress;
}

void pscan_run()
void pscan_run(void)
{
tty = isatty(STDOUT_FILENO);

Expand All @@ -230,7 +230,7 @@ void pscan_run()
printer = g_thread_new("progress_printer", pscan_progress_thread, NULL);
}

void pscan_join()
void pscan_join(void)
{
g_thread_join(printer);

Expand Down Expand Up @@ -277,7 +277,7 @@ void pscan_reset_thread(struct pscan_thread **progress)
(*progress)->file_path[0] = '\0';
}

bool is_progress_printer_running()
bool is_progress_printer_running(void)
{
return printer ? true : false;
}
Expand Down Expand Up @@ -312,7 +312,7 @@ void pscan_printf(char *fmt, ...)
g_mutex_unlock(&pscan.mutex);
}

static void *psearch_progress_thread(void *)
static void *psearch_progress_thread(void * p)
{
static int last_pos = -1;

Expand Down
10 changes: 5 additions & 5 deletions progress.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ struct pscan_global {
struct pscan_thread **threads;
};

void pscan_finish_listing();
void pscan_finish_listing(void);

/* Used to increment the global todo list */
void pscan_set_progress(uint64_t added_files, uint64_t added_bytes);
Expand All @@ -53,13 +53,13 @@ struct pscan_thread *pscan_register_thread(pid_t tid);
* - the listing is completed - pscan_finish_listing() has been called
* - the sum of all threads progresses equals to the global totals
*/
void pscan_run();
void pscan_run(void);

/*
* Wait for the progress thread to finish
* Also cleanup per-thread progresses and print the global totals
*/
void pscan_join();
void pscan_join(void);

/*
* Reset file tracking data
Expand All @@ -69,7 +69,7 @@ void pscan_join();
*/
void pscan_reset_thread(struct pscan_thread **progress);

bool is_progress_printer_running();
bool is_progress_printer_running(void);

/*
* The progress thread overwrites its area.
Expand All @@ -87,7 +87,7 @@ void psearch_run(uint64_t num_filerecs);
/*
* Wait for the progress thread to finish
*/
void psearch_join();
void psearch_join(void);

/*
* extent search: update the number of processed filerecs
Expand Down