18 changed files with 888 additions and 826 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -1,2 +0,0 @@
-_release
-_debug
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@ -9,14 +9,6 @@ concurrency:
  cancel-in-progress: true
 jobs:

-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - run: sudo apt-get install -y make clang-format
-      - run: make lint
-      - run: git diff --exit-code
-
  build-with-gcc:
    strategy:
      matrix:
@ -24,35 +16,29 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
-        with: {fetch-depth: 0}
      - run: sudo apt-get install -y build-essential
-      - run: make VERBOSE=1 CFG=${{ matrix.cfg}} -j$(nproc)
-      - run: |
-          _${{ matrix.cfg }}/inotify-info --version
-          _${{ matrix.cfg }}/inotify-info
+      - run: make CFG=${{ matrix.cfg}} -j$(nproc)
+      - run: _${{ matrix.cfg }}/inotify-info

  build-with-zig:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
-        with: {fetch-depth: 0}
      - uses: actions/cache@v4
        with:
          key: zig-sdk-and-cache-${{ hashFiles('.github/workflows/ci.yaml') }}
          path: ~/.cache/zig
      - run: |
          wget --progress=dot:mega \
-            https://ziglang.org/download/0.13.0/zig-linux-$(uname -m)-0.13.0.tar.xz
+            https://ziglang.org/download/0.11.0/zig-linux-$(uname -m)-0.11.0.tar.xz
          tar -xJf zig-linux-*.tar.xz
          rm zig-linux-*.xz
          mv zig-linux-* zig-sdk
      - run: |
-          make VERBOSE=1 -j$(nproc) \
+          make -j$(nproc) \
            CC="zig-sdk/zig cc -target $(uname -m)-linux-musl" \
            CXX="zig-sdk/zig c++ -target $(uname -m)-linux-musl"
-      - run: |
-          _release/inotify-info --version
-          _release/inotify-info
+      - run: _release/inotify-info

  build-with-docker:
    runs-on: ubuntu-latest
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@ -8,10 +8,15 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Archive
+        run: make inotify-info-${{ github.ref_name }}.tar.gz
      - name: Release
        uses: softprops/action-gh-release@v2
        if: startsWith(github.ref, 'refs/tags/v')
        with:
+          files: inotify-info-${{ github.ref_name }}.tar.gz
          generate_release_notes: true
          draft: true
          prerelease: true
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,4 @@
 _debug/
 _release/

-/inotify-info-*.tar.gz
+/inotify-info-v*.tar.gz
--- a/19
+++ b/19
@ -1,14 +1,23 @@
-FROM alpine:edge
+FROM alpine

-RUN apk add make zig git
+# zig is installed from the upstream tarball, because:
+# - as of writing, alpine has zig only in testing (which is cumbersome to use)
+# - apk get zig pulls in libllvm, which is huge.
+#
+# Upstream tarball is statically linked, making it small and convenient to use.
+RUN apk add make \
+ && wget https://ziglang.org/download/0.11.0/zig-linux-$(uname -m)-0.11.0.tar.xz \
+ && tar -xJf zig-linux-*.tar.xz \
+ && rm zig-linux-*.xz \
+ && mv zig-linux-* zig

 WORKDIR inotify-info

 COPY . .

-RUN CC="zig cc -target $(uname -m)-linux-musl" \
-    CXX="zig c++ -target $(uname -m)-linux-musl" \
-    make VERBOSE=1
+RUN CC="/zig/zig cc -target $(uname -m)-linux-musl" \
+    CXX="/zig/zig c++ -target $(uname -m)-linux-musl" \
+    make

 FROM scratch
 COPY --from=0 /inotify-info/_release/inotify-info /inotify-info
--- a/42
+++ b/42
@ -20,16 +20,11 @@ ifeq ($(CFG), debug)
    ASAN ?= 1
 endif

-PREFIX ?= /usr/local
-BINDIR := $(PREFIX)/bin
-
 LD = $(CC)
 RM = rm -f
 MKDIR = mkdir -p
 VERBOSE ?= 0

-INOTIFYINFO_VERSION ?= $(shell git describe --tags --dirty 2>/dev/null || echo unknown)
-
 COMPILER = $(shell $(CC) -v 2>&1 | grep -q "clang version" && echo clang || echo gcc)

 WARNINGS = -Wall -Wextra -Wpedantic -Wmissing-include-dirs -Wformat=2 -Wshadow
@ -38,15 +33,10 @@ ifneq ($(COMPILER),clang)
  WARNINGS += -Wsuggest-attribute=format -Wall
 endif

-DEFINES  = -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64
-DEFINES += -DINOTIFYINFO_VERSION=\"$(INOTIFYINFO_VERSION)\"
-
-CFLAGS += $(WARNINGS) $(DEFINES)
-CFLAGS += -std=gnu99 -fno-exceptions
-
-CXXFLAGS += $(WARNINGS) $(DEFINES)
-CXXFLAGS += -std=c++11 -fno-exceptions -fno-rtti -Woverloaded-virtual
-
+CFLAGS = $(WARNINGS) -march=native -fno-exceptions -gdwarf-4 -g2 -ggnu-pubnames -gsplit-dwarf
+CFLAGS += -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64
+CXXFLAGS = -fno-rtti -Woverloaded-virtual
+LDFLAGS = -march=native -gdwarf-4 -g2 -Wl,--build-id=sha1
 LIBS = -Wl,--no-as-needed -lm -ldl -lpthread -lstdc++

 CFILES = \
@ -69,7 +59,6 @@ ifeq ($(ASAN), 1)
 	ASAN_FLAGS += -fsanitize=object-size # enable object size checking, detect various out-of-bounds accesses.
 	ASAN_FLAGS += -fsanitize=alignment # enable alignment checking, detect various misaligned objects;
 	CFLAGS += $(ASAN_FLAGS)
-	CXXFLAGS += $(ASAN_FLAGS)
 	LDFLAGS += $(ASAN_FLAGS)
 endif

@ -83,6 +72,7 @@ else
 endif

 PROJ = $(ODIR)/$(NAME)
+$(info Building $(ODIR)/$(NAME)...)

 ifeq ($(VERBOSE), 1)
 	VERBOSE_PREFIX=
@ -104,16 +94,12 @@ $(ODIR)/$(NAME): $(OBJS)
 $(ODIR)/%.o: %.c Makefile
 	$(VERBOSE_PREFIX)echo "---- $< ----";
 	@$(MKDIR) $(dir $@)
-	$(VERBOSE_PREFIX)$(CC) -MMD -MP $(CFLAGS) -o $@ -c $<
+	$(VERBOSE_PREFIX)$(CC) -MMD -MP -std=gnu99 $(CFLAGS) -o $@ -c $<

 $(ODIR)/%.o: %.cpp Makefile
 	$(VERBOSE_PREFIX)echo "---- $< ----";
 	@$(MKDIR) $(dir $@)
-	$(VERBOSE_PREFIX)$(CXX) -MMD -MP $(CXXFLAGS) -o $@ -c $<
-
-.PHONY: lint
-lint:
-	find . -name '*.h' -o -name '*.c' -o -name '*.cpp' | xargs clang-format -i --style=webkit
+	$(VERBOSE_PREFIX)$(CXX) -MMD -MP -std=c++11 $(CFLAGS) $(CXXFLAGS) -o $@ -c $<

 .PHONY: clean

@ -124,18 +110,8 @@ clean:
 	$(VERBOSE_PREFIX)$(RM) $(OBJS:.o=.d)
 	$(VERBOSE_PREFIX)$(RM) $(OBJS:.o=.dwo)

-.PHONY: install
-
-install: all
-	install -D $(PROJ) $(BINDIR)/$(NAME)
-
-.PHONY: uninstall
-
-uninstall:
-	$(RM) $(BINDIR)/$(NAME)
-
 define RELEASE_RULES
 inotify-info-$(TAG).tar.gz:
-	git archive --prefix=inotify-info-$(TAG)/ v$(TAG) | gzip -n > $$@
+	git archive --prefix=inotify-info-$(TAG)/ $(TAG) | gzip -n > $$@
 endef
-$(foreach TAG,$(shell git tag 2>/dev/null | sed -n '/^v/ s/^v//p'),$(eval $(RELEASE_RULES)))
+$(foreach TAG,$(shell git tag 2>/dev/null),$(eval $(RELEASE_RULES)))
--- a/README.md
+++ b/README.md
@ -22,11 +22,17 @@ Building _debug/inotify-info...
 Linking _debug/inotify-info...
 ```

-## Install
+Or you can build Docker image.

-The resulting executable will be at `_release/inotify-info`. You are free to
-copy the resulting executable to any suitable location in your `$PATH` or run
-`make install` to install to `/usr/local/bin`.
+```sh
+docker build . -t inotify-info
+```
+
+## Install
+You are free to copy the resulting executable to any suitable location in your `$PATH`.
+```
+cp _release/inotify-info /usr/local/bin/
+```

 ## Run (Prints Summary)
 ```
@ -154,16 +160,12 @@ Searching '/' for listed inodes... (8 threads)
 94111468 [10304h] /home/mikesart/.cache/xfce4/xfce4-appfinder/
 ```

-## Run on Docker/podman
+## Run on Docker

 ```sh
-docker build . -t inotify-info
 docker run --rm --privileged -v /proc:/proc inotify-info
 ```

-When running under [podman][podman] non-root mode, append `--ulimit
-nofile=65535:65535` to the `podman build` command.
-
 ## Run on Nix(OS)

 ```
@ -179,4 +181,3 @@ nix run nixpkgs#inotify-info
 [problem2]: https://unix.stackexchange.com/questions/15509/whos-consuming-my-inotify-resources  
 [lfqueue]:  https://github.com/Taymindis/lfqueue
 [bsd]:      https://github.com/Taymindis/lfqueue/blob/master/LICENSE
-[podman]:   https://podman.io/
--- a/debian/changelog
+++ b/debian/changelog
@ -1,23 +1,3 @@
-inotify-info (0.0.3-1) sid; urgency=medium
-
-  * Uploading to sid.
-  * Merging upstream version 0.0.3.
-  * Removing manual debhelper install file, not needed anymore with new
-    upstream version.
-  * Enabling non-silent output during build.
-
- -- Daniel Baumann <daniel.baumann@progress-linux.org>  Sat, 13 Jul 2024 13:02:30 +0200
-
-inotify-info (0.0.2-1) sid; urgency=medium
-
-  * Uploading to sid.
-  * Merging upstream version 0.0.2.
-  * Removing march.patch, not needed anymore.
-  * Removing dwz.patch, not needed anymore.
-  * Setting INOTIFYINFO_VERSION to debian package version.
-
- -- Daniel Baumann <daniel.baumann@progress-linux.org>  Mon, 03 Jun 2024 22:01:31 +0200
-
 inotify-info (0.0.1-2) sid; urgency=medium

  * Uploading to sid.
--- a/debian/copyright
+++ b/debian/copyright
@ -1,7 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: inotify-info
 Upstream-Contact: https://github.com/mikesart/inotify-info/issues
-Source: https://github.com/mikesart/inotify-info/tags
+Source: https://github.com/mikesart/inotify-info/releases

 Files: *
 Copyright: 2021 Michael Sartain <mikesart@fastmail.com>
--- a/debian/inotify-info.install
+++ b/debian/inotify-info.install
@ -0,0 +1 @@
+_release/inotify-info	/usr/bin
--- a/debian/patches/debian/0001-march.patch
+++ b/debian/patches/debian/0001-march.patch
@ -0,0 +1,19 @@
+Author: Daniel Baumann <daniel.baumann@progress-linux.org>
+Description: Building without -march=native (Closes: #1071076).
+
+diff -Naurp inotify-info.orig/Makefile inotify-info/Makefile
+--- inotify-info.orig/Makefile
+++ inotify-info/Makefile
+@@ -33,10 +33,10 @@ ifneq ($(COMPILER),clang)
+   WARNINGS += -Wsuggest-attribute=format -Wall
+ endif
+ 
+-CFLAGS = $(WARNINGS) -march=native -fno-exceptions -gdwarf-4 -g2 -ggnu-pubnames -gsplit-dwarf
+CFLAGS = $(WARNINGS) -fno-exceptions -gdwarf-4 -g2 -ggnu-pubnames -gsplit-dwarf
+ CFLAGS += -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64
+ CXXFLAGS = -fno-rtti -Woverloaded-virtual
+-LDFLAGS = -march=native -gdwarf-4 -g2 -Wl,--build-id=sha1
+LDFLAGS = -gdwarf-4 -g2 -Wl,--build-id=sha1
+ LIBS = -Wl,--no-as-needed -lm -ldl -lpthread -lstdc++
+ 
+ CFILES = \
--- a/debian/patches/debian/0002-dwz.patch
+++ b/debian/patches/debian/0002-dwz.patch
@ -0,0 +1,15 @@
+Author: Daniel Baumann <daniel.baumann@progress-linux.org>
+Description: Building without -gsplit-dwarf to workaround bug in dwz causing FTBFS (#1016936).
+
+diff -Naurp inotify-info.orig/Makefile inotify-info/Makefile
+--- inotify-info.orig/Makefile
+++ inotify-info/Makefile
+@@ -33,7 +33,7 @@ ifneq ($(COMPILER),clang)
+   WARNINGS += -Wsuggest-attribute=format -Wall
+ endif
+ 
+-CFLAGS = $(WARNINGS) -fno-exceptions -gdwarf-4 -g2 -ggnu-pubnames -gsplit-dwarf
+CFLAGS = $(WARNINGS) -fno-exceptions -gdwarf-4 -g2 -ggnu-pubnames
+ CFLAGS += -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64
+ CXXFLAGS = -fno-rtti -Woverloaded-virtual
+ LDFLAGS = -gdwarf-4 -g2 -Wl,--build-id=sha1
--- a/debian/patches/series
+++ b/debian/patches/series
@ -0,0 +1,2 @@
+debian/0001-march.patch
+debian/0002-dwz.patch
--- a/debian/rules
+++ b/debian/rules
@ -1,15 +1,7 @@
 #!/usr/bin/make -f

-export INOTIFYINFO_VERSION = $(shell dpkg-parsechangelog -SVersion)
-
 %:
 	dh ${@}

 execute_after_dh_auto_clean:
 	rm -rf _release
-
-override_dh_auto_build:
-	dh_auto_build -- VERBOSE=1
-
-override_dh_auto_install:
-	dh_auto_install -- PREFIX=$(CURDIR)/debian/inotify-info/usr
--- a/inotify-info.cpp
+++ b/inotify-info.cpp
--- a/inotify-info.h
+++ b/inotify-info.h
@ -40,20 +40,21 @@
 #define BCYAN    "\x1b[1;36m"
 #define BWHITE   "\x1b[1;37m"

-#define TO_STR(x) #x
-#define TO_STR_VALUE(x) TO_STR(x)
+#define TO_STR( x ) #x
+#define TO_STR_VALUE( x ) TO_STR( x )

-#define ATTRIBUTE_PRINTF(_x, _y) __attribute__((__format__(__printf__, _x, _y)))
+#define ATTRIBUTE_PRINTF( _x, _y ) __attribute__( ( __format__( __printf__, _x, _y ) ) )

-#define GCC_DIAG_STR(s) #s
-#define GCC_DIAG_JOINSTR(x, y) GCC_DIAG_STR(x##y)
-#define GCC_DIAG_DO_PRAGMA(x) _Pragma(#x)
-#define GCC_DIAG_PRAGMA(x) GCC_DIAG_DO_PRAGMA(GCC diagnostic x)
+#define GCC_DIAG_STR( s ) #s
+#define GCC_DIAG_JOINSTR( x, y ) GCC_DIAG_STR( x##y )
+#define GCC_DIAG_DO_PRAGMA( x ) _Pragma( #x )
+#define GCC_DIAG_PRAGMA( x ) GCC_DIAG_DO_PRAGMA( GCC diagnostic x )

-#define GCC_DIAG_PUSH_OFF(x) \
-    GCC_DIAG_PRAGMA(push)    \
-    GCC_DIAG_PRAGMA(ignored GCC_DIAG_JOINSTR(-W, x))
-#define GCC_DIAG_POP() GCC_DIAG_PRAGMA(pop)
+#define GCC_DIAG_PUSH_OFF( x ) \
+    GCC_DIAG_PRAGMA( push )    \
+    GCC_DIAG_PRAGMA( ignored GCC_DIAG_JOINSTR( -W, x ) )
+#define GCC_DIAG_POP() GCC_DIAG_PRAGMA( pop )
+
+std::string string_formatv(const char *fmt, va_list ap) ATTRIBUTE_PRINTF(1, 0);
+std::string string_format(const char *fmt, ...) ATTRIBUTE_PRINTF(1, 2);

-std::string string_formatv(const char* fmt, va_list ap) ATTRIBUTE_PRINTF(1, 0);
-std::string string_format(const char* fmt, ...) ATTRIBUTE_PRINTF(1, 2);
--- a/lfqueue/lfqueue.c
+++ b/lfqueue/lfqueue.c
@ -1,40 +1,40 @@
 /*
- *
- * BSD 2-Clause License
- *
- * Copyright (c) 2018, Taymindis Woon
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-#include <errno.h>
+*
+* BSD 2-Clause License
+*
+* Copyright (c) 2018, Taymindis Woon
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+* * Redistributions of source code must retain the above copyright notice, this
+*   list of conditions and the following disclaimer.
+*
+* * Redistributions in binary form must reproduce the above copyright notice,
+*   this list of conditions and the following disclaimer in the documentation
+*   and/or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
 #include <stdio.h>
 #include <stdlib.h>
+#include <errno.h>
 #if defined __GNUC__ || defined __CYGWIN__ || defined __MINGW32__ || defined __APPLE__

-#include <sched.h>
 #include <sys/time.h>
 #include <unistd.h> // for usleep
+#include <sched.h>

 #define __LFQ_VAL_COMPARE_AND_SWAP __sync_val_compare_and_swap
 #define __LFQ_BOOL_COMPARE_AND_SWAP __sync_bool_compare_and_swap
@ -48,14 +48,13 @@
 #include <Windows.h>
 #include <time.h>
 #ifdef _WIN64
-inline BOOL __SYNC_BOOL_CAS(LONG64 volatile* dest, LONG64 input, LONG64 comparand)
-{
+inline BOOL __SYNC_BOOL_CAS(LONG64 volatile *dest, LONG64 input, LONG64 comparand) {
 	return InterlockedCompareExchangeNoFence64(dest, input, comparand) == comparand;
 }
 #define __LFQ_VAL_COMPARE_AND_SWAP(dest, comparand, input) \
-    InterlockedCompareExchangeNoFence64((LONG64 volatile*)dest, (LONG64)input, (LONG64)comparand)
+    InterlockedCompareExchangeNoFence64((LONG64 volatile *)dest, (LONG64)input, (LONG64)comparand)
 #define __LFQ_BOOL_COMPARE_AND_SWAP(dest, comparand, input) \
-    __SYNC_BOOL_CAS((LONG64 volatile*)dest, (LONG64)input, (LONG64)comparand)
+    __SYNC_BOOL_CAS((LONG64 volatile *)dest, (LONG64)input, (LONG64)comparand)
 #define __LFQ_FETCH_AND_ADD InterlockedExchangeAddNoFence64
 #define __LFQ_ADD_AND_FETCH InterlockedAddNoFence64
 #define __LFQ_SYNC_MEMORY MemoryBarrier
@ -64,14 +63,13 @@ inline BOOL __SYNC_BOOL_CAS(LONG64 volatile* dest, LONG64 input, LONG64 comparan
 #ifndef asm
 #define asm __asm
 #endif
-inline BOOL __SYNC_BOOL_CAS(LONG volatile* dest, LONG input, LONG comparand)
-{
+inline BOOL __SYNC_BOOL_CAS(LONG volatile *dest, LONG input, LONG comparand) {
 	return InterlockedCompareExchangeNoFence(dest, input, comparand) == comparand;
 }
 #define __LFQ_VAL_COMPARE_AND_SWAP(dest, comparand, input) \
-    InterlockedCompareExchangeNoFence((LONG volatile*)dest, (LONG)input, (LONG)comparand)
+    InterlockedCompareExchangeNoFence((LONG volatile *)dest, (LONG)input, (LONG)comparand)
 #define __LFQ_BOOL_COMPARE_AND_SWAP(dest, comparand, input) \
-    __SYNC_BOOL_CAS((LONG volatile*)dest, (LONG)input, (LONG)comparand)
+    __SYNC_BOOL_CAS((LONG volatile *)dest, (LONG)input, (LONG)comparand)
 #define __LFQ_FETCH_AND_ADD InterlockedExchangeAddNoFence
 #define __LFQ_ADD_AND_FETCH InterlockedAddNoFence
 #define __LFQ_SYNC_MEMORY() asm mfence
@ -87,9 +85,9 @@ inline BOOL __SYNC_BOOL_CAS(LONG volatile* dest, LONG input, LONG comparand)
 #if defined __GNUC__ || defined __CYGWIN__ || defined __MINGW32__ || defined __APPLE__
 #define lfq_time_t long
 #define lfq_get_curr_time(_time_sec) \
-    struct timeval _time_;           \
-    gettimeofday(&_time_, NULL);     \
-    *_time_sec = _time_.tv_sec
+struct timeval _time_; \
+gettimeofday(&_time_, NULL); \
+*_time_sec = _time_.tv_sec
 #define lfq_diff_time(_etime_, _stime_) _etime_ - _stime_
 #else
 #define lfq_time_t time_t
@ -98,31 +96,28 @@ inline BOOL __SYNC_BOOL_CAS(LONG volatile* dest, LONG input, LONG comparand)
 #endif

 struct lfqueue_cas_node_s {
-    void* value;
+	void * value;
 	struct lfqueue_cas_node_s *next, *nextfree;
 	lfq_time_t _deactivate_tm;
 };

-// static lfqueue_cas_node_t* __lfq_assigned(lfqueue_t *);
-static void __lfq_recycle_free(lfqueue_t*, lfqueue_cas_node_t*);
-static void __lfq_check_free(lfqueue_t*);
-static void* _dequeue(lfqueue_t*);
-static void* _single_dequeue(lfqueue_t*);
-static int _enqueue(lfqueue_t*, void*);
-static inline void* _lfqueue_malloc(__attribute__((unused)) void* pl, size_t sz)
-{
+//static lfqueue_cas_node_t* __lfq_assigned(lfqueue_t *);
+static void __lfq_recycle_free(lfqueue_t *, lfqueue_cas_node_t*);
+static void __lfq_check_free(lfqueue_t *);
+static void *_dequeue(lfqueue_t *);
+static void *_single_dequeue(lfqueue_t *);
+static int _enqueue(lfqueue_t *, void* );
+static inline void* _lfqueue_malloc(__attribute__ ((unused)) void* pl, size_t sz) {
 	return malloc(sz);
 }
-static inline void _lfqueue_free(__attribute__((unused)) void* pl, void* ptr)
-{
+static inline void _lfqueue_free(__attribute__ ((unused)) void* pl, void* ptr) {
 	free(ptr);
 }

-static void*
-_dequeue(lfqueue_t* lfqueue)
-{
+static void *
+_dequeue(lfqueue_t *lfqueue) {
 	lfqueue_cas_node_t *head, *next;
-    void* val;
+	void *val;

 	for (;;) {
 		head = lfqueue->head;
@ -133,7 +128,8 @@ _dequeue(lfqueue_t* lfqueue)
 					val = NULL;
 					goto _done;
 				}
-            } else {
+			}
+			else {
 				if (next) {
 					val = next->value;
 					if (__LFQ_BOOL_COMPARE_AND_SWAP(&lfqueue->head, head, next)) {
@ -155,11 +151,10 @@ _done:
 	return val;
 }

-static void*
-_single_dequeue(lfqueue_t* lfqueue)
-{
+static void *
+_single_dequeue(lfqueue_t *lfqueue) {
 	lfqueue_cas_node_t *head, *next;
-    void* val;
+	void *val;

 	for (;;) {
 		head = lfqueue->head;
@ -169,7 +164,8 @@ _single_dequeue(lfqueue_t* lfqueue)
 				if (next == NULL) {
 					return NULL;
 				}
-            } else {
+			}
+			else {
 				if (next) {
 					val = next->value;
 					if (__LFQ_BOOL_COMPARE_AND_SWAP(&lfqueue->head, head, next)) {
@ -186,10 +182,9 @@ _single_dequeue(lfqueue_t* lfqueue)
 }

 static int
-_enqueue(lfqueue_t* lfqueue, void* value)
-{
+_enqueue(lfqueue_t *lfqueue, void* value) {
 	lfqueue_cas_node_t *tail, *node;
-    node = (lfqueue_cas_node_t*)lfqueue->_malloc(lfqueue->pl, sizeof(lfqueue_cas_node_t));
+	node = (lfqueue_cas_node_t*) lfqueue->_malloc(lfqueue->pl, sizeof(lfqueue_cas_node_t));
 	if (node == NULL) {
 		perror("malloc");
 		return errno;
@ -213,12 +208,11 @@ _enqueue(lfqueue_t* lfqueue, void* value)
 }

 static void
-__lfq_recycle_free(lfqueue_t* lfqueue, lfqueue_cas_node_t* freenode)
-{
-    lfqueue_cas_node_t* freed;
+__lfq_recycle_free(lfqueue_t *lfqueue, lfqueue_cas_node_t* freenode) {
+	lfqueue_cas_node_t *freed;
 	do {
 		freed = lfqueue->move_free;
-    } while (!__LFQ_BOOL_COMPARE_AND_SWAP(&freed->nextfree, NULL, freenode));
+	} while (!__LFQ_BOOL_COMPARE_AND_SWAP(&freed->nextfree, NULL, freenode) );

 	lfq_get_curr_time(&freenode->_deactivate_tm);

@ -226,15 +220,14 @@ __lfq_recycle_free(lfqueue_t* lfqueue, lfqueue_cas_node_t* freenode)
 }

 static void
-__lfq_check_free(lfqueue_t* lfqueue)
-{
+__lfq_check_free(lfqueue_t *lfqueue) {
 	lfq_time_t curr_time;
 	if (__LFQ_BOOL_COMPARE_AND_SWAP(&lfqueue->in_free_mode, 0, 1)) {
 		lfq_get_curr_time(&curr_time);
 		lfqueue_cas_node_t *rtfree = lfqueue->root_free, *nextfree;
-        while (rtfree && (rtfree != lfqueue->move_free)) {
+		while ( rtfree && (rtfree != lfqueue->move_free) ) {
 			nextfree = rtfree->nextfree;
-            if (lfq_diff_time(curr_time, rtfree->_deactivate_tm) > 2) {
+			if ( lfq_diff_time(curr_time, rtfree->_deactivate_tm) > 2) {
 				//	printf("%p\n", rtfree);
 				lfqueue->_free(lfqueue->pl, rtfree);
 				rtfree = nextfree;
@ -248,19 +241,19 @@ __lfq_check_free(lfqueue_t* lfqueue)
 	__LFQ_SYNC_MEMORY();
 }

-int lfqueue_init(lfqueue_t* lfqueue)
-{
+int
+lfqueue_init(lfqueue_t *lfqueue) {
 	return lfqueue_init_mf(lfqueue, NULL, _lfqueue_malloc, _lfqueue_free);
 }

-int lfqueue_init_mf(lfqueue_t* lfqueue, void* pl, lfqueue_malloc_fn lfqueue_malloc, lfqueue_free_fn lfqueue_free)
-{
+int
+lfqueue_init_mf(lfqueue_t *lfqueue, void* pl, lfqueue_malloc_fn lfqueue_malloc, lfqueue_free_fn lfqueue_free) {
 	lfqueue->_malloc = lfqueue_malloc;
 	lfqueue->_free = lfqueue_free;
 	lfqueue->pl = pl;

-    lfqueue_cas_node_t* base = lfqueue_malloc(pl, sizeof(lfqueue_cas_node_t));
-    lfqueue_cas_node_t* freebase = lfqueue_malloc(pl, sizeof(lfqueue_cas_node_t));
+	lfqueue_cas_node_t *base = lfqueue_malloc(pl, sizeof(lfqueue_cas_node_t));
+	lfqueue_cas_node_t *freebase = lfqueue_malloc(pl, sizeof(lfqueue_cas_node_t));
 	if (base == NULL || freebase == NULL) {
 		perror("malloc");
 		return errno;
@ -283,15 +276,15 @@ int lfqueue_init_mf(lfqueue_t* lfqueue, void* pl, lfqueue_malloc_fn lfqueue_mall
 	return 0;
 }

-void lfqueue_destroy(lfqueue_t* lfqueue)
-{
+void
+lfqueue_destroy(lfqueue_t *lfqueue) {
 	void* p;
 	while ((p = lfqueue_deq(lfqueue))) {
 		lfqueue->_free(lfqueue->pl, p);
 	}
 	// Clear the recycle chain nodes
 	lfqueue_cas_node_t *rtfree = lfqueue->root_free, *nextfree;
-    while (rtfree && (rtfree != lfqueue->move_free)) {
+	while (rtfree && (rtfree != lfqueue->move_free) ) {
 		nextfree = rtfree->nextfree;
 		lfqueue->_free(lfqueue->pl, rtfree);
 		rtfree = nextfree;
@ -305,8 +298,8 @@ void lfqueue_destroy(lfqueue_t* lfqueue)
 	lfqueue->size = 0;
 }

-int lfqueue_enq(lfqueue_t* lfqueue, void* value)
-{
+int
+lfqueue_enq(lfqueue_t *lfqueue, void *value) {
 	if (_enqueue(lfqueue, value)) {
 		return -1;
 	}
@ -314,11 +307,12 @@ int lfqueue_enq(lfqueue_t* lfqueue, void* value)
 	return 0;
 }

-void* lfqueue_deq(lfqueue_t* lfqueue)
-{
-    void* v;
-    if ( //__LFQ_ADD_AND_FETCH(&lfqueue->size, 0) &&
-        (v = _dequeue(lfqueue))) {
+void*
+lfqueue_deq(lfqueue_t *lfqueue) {
+	void *v;
+	if (//__LFQ_ADD_AND_FETCH(&lfqueue->size, 0) &&
+	    (v = _dequeue(lfqueue))
+	) {

 		__LFQ_FETCH_AND_ADD(&lfqueue->size, -1);
 		return v;
@ -326,10 +320,10 @@ void* lfqueue_deq(lfqueue_t* lfqueue)
 	return NULL;
 }

-void* lfqueue_deq_must(lfqueue_t* lfqueue)
-{
-    void* v;
-    while (!(v = _dequeue(lfqueue))) {
+void*
+lfqueue_deq_must(lfqueue_t *lfqueue) {
+	void *v;
+	while ( !(v = _dequeue(lfqueue)) ) {
 		// Rest the thread for other thread, to avoid keep looping force
 		lfqueue_sleep(1);
 	}
@ -338,11 +332,12 @@ void* lfqueue_deq_must(lfqueue_t* lfqueue)
 }

 /**This is only applicable when only single thread consume only**/
-void* lfqueue_single_deq(lfqueue_t* lfqueue)
-{
-    void* v;
-    if ( //__LFQ_ADD_AND_FETCH(&lfqueue->size, 0) &&
-        (v = _single_dequeue(lfqueue))) {
+void*
+lfqueue_single_deq(lfqueue_t *lfqueue) {
+	void *v;
+	if (//__LFQ_ADD_AND_FETCH(&lfqueue->size, 0) &&
+	    (v = _single_dequeue(lfqueue))
+	) {

 		__LFQ_FETCH_AND_ADD(&lfqueue->size, -1);
 		return v;
@ -351,10 +346,10 @@ void* lfqueue_single_deq(lfqueue_t* lfqueue)
 }

 /**This is only applicable when only single thread consume only**/
-void* lfqueue_single_deq_must(lfqueue_t* lfqueue)
-{
-    void* v;
-    while (!(v = _single_dequeue(lfqueue))) {
+void*
+lfqueue_single_deq_must(lfqueue_t *lfqueue) {
+	void *v;
+	while ( !(v = _single_dequeue(lfqueue)) ) {
 		// Rest the thread for other thread, to avoid keep looping force
 		lfqueue_sleep(1);
 	}
@ -363,13 +358,12 @@ void* lfqueue_single_deq_must(lfqueue_t* lfqueue)
 }

 size_t
-lfqueue_size(lfqueue_t* lfqueue)
-{
+lfqueue_size(lfqueue_t *lfqueue) {
 	return __LFQ_ADD_AND_FETCH(&lfqueue->size, 0);
 }

-void lfqueue_sleep(unsigned int milisec)
-{
+void
+lfqueue_sleep(unsigned int milisec) {
 #if defined __GNUC__ || defined __CYGWIN__ || defined __MINGW32__ || defined __APPLE__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wimplicit-function-declaration"
--- a/lfqueue/lfqueue.h
+++ b/lfqueue/lfqueue.h
@ -1,38 +1,38 @@
 /*
- *
- * BSD 2-Clause License
- *
- * Copyright (c) 2018, Taymindis Woon
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
+*
+* BSD 2-Clause License
+*
+* Copyright (c) 2018, Taymindis Woon
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+* * Redistributions of source code must retain the above copyright notice, this
+*   list of conditions and the following disclaimer.
+*
+* * Redistributions in binary form must reproduce the above copyright notice,
+*   this list of conditions and the following disclaimer in the documentation
+*   and/or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/

 #ifndef LFQUEUE_H
 #define LFQUEUE_H

-#include <stdint.h>
 #include <stdlib.h>
+#include <stdint.h>

 #ifdef __cplusplus
 extern "C" {
@ -58,25 +58,27 @@ typedef struct {
 	volatile lfq_bool_t in_free_mode;
 	lfqueue_malloc_fn _malloc;
 	lfqueue_free_fn _free;
-    void* pl;
+	void *pl;
 } lfqueue_t;

-extern int lfqueue_init(lfqueue_t* lfqueue);
-extern int lfqueue_init_mf(lfqueue_t* lfqueue, void* pl, lfqueue_malloc_fn lfqueue_malloc, lfqueue_free_fn lfqueue_free);
-extern int lfqueue_enq(lfqueue_t* lfqueue, void* value);
-extern void* lfqueue_deq(lfqueue_t* lfqueue);
-extern void* lfqueue_single_deq(lfqueue_t* lfqueue);
+extern int   lfqueue_init(lfqueue_t *lfqueue);
+extern int   lfqueue_init_mf(lfqueue_t *lfqueue, void* pl, lfqueue_malloc_fn lfqueue_malloc, lfqueue_free_fn lfqueue_free);
+extern int   lfqueue_enq(lfqueue_t *lfqueue, void *value);
+extern void* lfqueue_deq(lfqueue_t *lfqueue);
+extern void* lfqueue_single_deq(lfqueue_t *lfqueue);

 /** loop until value been dequeue, it sleeps 1ms if not found to reduce cpu high usage **/
-extern void* lfqueue_deq_must(lfqueue_t* lfqueue);
-extern void* lfqueue_single_deq_must(lfqueue_t* lfqueue);
+extern void* lfqueue_deq_must(lfqueue_t *lfqueue);
+extern void* lfqueue_single_deq_must(lfqueue_t *lfqueue);

-extern void lfqueue_destroy(lfqueue_t* lfqueue);
-extern size_t lfqueue_size(lfqueue_t* lfqueue);
+extern void lfqueue_destroy(lfqueue_t *lfqueue);
+extern size_t lfqueue_size(lfqueue_t *lfqueue);
 extern void lfqueue_sleep(unsigned int milisec);

+
 #ifdef __cplusplus
 }
 #endif

 #endif
+