Skip to content

Minor cleanups #454

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.

Sign up for GitHub

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

Open
tjwoodall wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Minor cleanups #454

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include <stddef.h>
#include <stdbool.h>
#include <string.h>
#include <limits.h>
#include <dirent.h>
#include <assert.h>
#include <errno.h>
Expand Down Expand Up @@ -68,10 +67,10 @@
#include <plugin.h>

#ifndef TEMP_FAILURE_RETRY
# define TEMP_FAILURE_RETRY(expression) \
(__extension__ ({ long int __result; \
do __result = (long int) (expression); \
while (__result == -1L && errno == EINTR); \
# define TEMP_FAILURE_RETRY(expression) \
(__extension__ ({ long int __result; \
do __result = (long int) (expression); \
while (__result == -1L && errno == EINTR); \
__result; }))
#endif

Expand Down Expand Up @@ -308,7 +307,7 @@ check_writeable_proc ()

if (svfs.f_type != PROC_SUPER_MAGIC)
{
fprintf (stderr, "invalid file system type found on /proc: %d, expected %d\n", svfs.f_fsid, PROC_SUPER_MAGIC);
fprintf (stderr, "invalid file system type found on /proc: %ld, expected %d\n", (long)svfs.f_type, PROC_SUPER_MAGIC);
return;
}

Expand Down Expand Up @@ -5758,7 +5757,7 @@ main (int argc, char *argv[])

read_overflowids ();

pthread_mutex_init (&lock, PTHREAD_MUTEX_DEFAULT);
pthread_mutex_init (&lock, NULL);

if (opts.show_help)
{
Expand Down