Skip to content

Commit 2759001

Browse files
rickrick
rick
authored and
rick
committed
tighten up code
1 parent cc8f865 commit 2759001

File tree

120 files changed

+530
-185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+530
-185
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,5 @@ example1.db
4545
commits.json
4646
*/.attic*
4747
select_description1/survey
48+
google.html
49+
.wraps

.gitmodules

+15
Original file line numberDiff line numberDiff line change
@@ -946,3 +946,18 @@
946946
[submodule "submodules/hexify_c"]
947947
path = submodules/hexify_c
948948
url = https://github.com/pepaslabs/hexify.c
949+
[submodule "submodules/log"]
950+
path = submodules/log
951+
url = [email protected]:binRick/c_log.git
952+
[submodule "submodules/w2ui"]
953+
path = submodules/w2ui
954+
url = https://github.com/vitmalina/w2ui
955+
[submodule "submodules/ttyd"]
956+
path = submodules/ttyd
957+
url = https://github.com/tsl0922/ttyd
958+
[submodule "submodules/libwebsockets"]
959+
path = submodules/libwebsockets
960+
url = https://github.com/warmcat/libwebsockets
961+
[submodule "submodules/c_libmonitors"]
962+
path = submodules/c_libmonitors
963+
url = [email protected]:binRick/c_libmonitors.git

base64-simple-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ base64_simple_test_deps = [
1313
base64_simple_dep,
1414
c_stringfn_dep,
1515
ansi_codes_dep,
16-
logh_dep,
16+
log_dep,
1717
timestamp_dep,
1818
]
1919
base64_simple_test_c_args = [

base64-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ base64_test_deps = [
1313
c_stringfn_dep,
1414
ansi_codes_dep,
1515
base64_dep,
16-
logh_dep,
16+
log_dep,
1717
]
1818
base64_test_c_args = [
1919
]

bestline-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bestline_test_deps = [
1212
c_fsio_dep,
1313
c_stringfn_dep,
1414
ansi_codes_dep,
15-
logh_dep,
15+
log_dep,
1616
timestamp_dep,
1717
ms_dep,
1818
bytes_dep,

bitfield-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ bitfield_test_deps = [
1313
bitfield_dep,
1414
c_stringfn_dep,
1515
ansi_codes_dep,
16-
logh_dep,
16+
log_dep,
1717
timestamp_dep,
1818
]
1919
bitfield_test_c_args = [

c-meson-utils-cli/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ c_meson_utils_cli_deps = [
1414
c_stringfn_dep,
1515
c_string_buffer_dep,
1616
ansi_codes_dep,
17-
logh_dep,
17+
log_dep,
1818
]
1919

2020
if get_option('enable-binaries')

c-meson-utils-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ c_meson_utils_test_deps = [
1616
c_string_buffer_dep,
1717
c_greatest_dep,
1818
ansi_codes_dep,
19-
logh_dep,
19+
log_dep,
2020
]
2121

2222
if get_option('enable-binaries')

chan-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ chan_test_deps = [
88
chan_dep,
99
c_greatest_dep,
1010
ansi_codes_dep,
11-
logh_dep,
11+
log_dep,
1212
ms_dep,
1313
timestamp_dep,
1414
c_timer_dep,

clamp-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ clamp_test_deps = [
1313
c_fsio_dep,
1414
c_stringfn_dep,
1515
ansi_codes_dep,
16-
logh_dep,
16+
log_dep,
1717
timestamp_dep,
1818
]
1919
clamp_test_c_args = [

closefrom-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ closefrom_test_deps = [
1313
c_stringfn_dep,
1414
ansi_codes_dep,
1515
closefrom_dep,
16-
logh_dep,
16+
log_dep,
1717
timestamp_dep,
1818
]
1919
closefrom_test_c_args = [

confuse-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ confuse_test_deps = [
1212
c_fsio_dep,
1313
c_stringfn_dep,
1414
ansi_codes_dep,
15-
logh_dep,
15+
log_dep,
1616
timestamp_dep,
1717
ms_dep,
1818
bytes_dep,

ctable-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ctable_test_deps = [
1313
c_fsio_dep,
1414
c_stringfn_dep,
1515
ansi_codes_dep,
16-
logh_dep,
16+
log_dep,
1717
timestamp_dep,
1818
]
1919
ctable_test_c_args = [

dbgp-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dbgp_test_dbgp = [
1010
chan_dep,
1111
c_greatest_dep,
1212
ansi_codes_dep,
13-
logh_dep,
13+
log_dep,
1414
ms_dep,
1515
timestamp_dep,
1616
c_timer_dep,

debug-print-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ debug_print_test_deps = [
1313
c_fsio_dep,
1414
c_stringfn_dep,
1515
ansi_codes_dep,
16-
logh_dep,
16+
log_dep,
1717
timestamp_dep,
1818
]
1919
debug_print_test_c_args = [

deps-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ deps_test_deps = [
4848
libforks_dep,
4949
colorwheel_dep,
5050
siphash_dep,
51-
logh_dep,
51+
log_dep,
5252
c_forever_dep,
5353
layout_dep,
5454
c_dbg_dep,

deps/deps.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
#include "slug.c/deps/case.h"
3232
#include "slug.c/deps/trim.h"
3333
#include "slug.c/src/slug.h"
34-
#include "spin/spin.h"
34+
//#include "spin/spin.h"
3535
#include "which/src/which.h"
3636
//////////////////////////////////////////////////////

dotenv-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dotenv_test_deps = [
1313
c_stringfn_dep,
1414
dotenv_c_dep,
1515
ansi_codes_dep,
16-
logh_dep,
16+
log_dep,
1717
timestamp_dep,
1818
]
1919
dotenv_test_c_args = [

ee-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ee_test_deps = [
99
list_dep,
1010
c_greatest_dep,
1111
ansi_codes_dep,
12-
logh_dep,
12+
log_dep,
1313
]
1414

1515
if get_option('enable-binaries')

etc/meson.mk

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
############################################
22
MESON_BUILD_DIR=build
3-
MESON_DEFAULT_BUILD_TYPE=minsize
43
MESON_DEFAULT_BUILD_TYPE=debug
4+
MESON_DEFAULT_BUILD_TYPE=minsize
55
############################################
66
BUILD_TYPE ?=$(MESON_DEFAULT_BUILD_TYPE)
77
BUILD_JOBS ?=10
@@ -26,8 +26,6 @@ meson-setup:
2626

2727
meson-build: meson-setup
2828
@$(MESON) compile -C $(MESON_BUILD_DIR) -j $(MESON_PARALLEL_JOBS)
29-
#| tee .meson-build.log
30-
#@$(GREP) 'warning:' .meson-build.log |egrep -v 'submodules|unused parameter' | tee .meson-build-warnings.log
3129

3230
do-build: meson-build muon-build
3331

etc/muon.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ MUON_PARALLEL_COMMANDS=10
33
muon-setup:
44
@$(MUON) setup \
55
-b \
6-
-D buildtype=debug \
6+
-D buildtype=minsize \
77
-D default_library=static \
88
-D strip=true \
9-
-D warning_level=0 \
9+
-D warning_level=2 \
1010
-D debug=false \
1111
$(MUON_BUILD_DIR)
1212
muon-build:

etc/template-subdir-binary_h.j2

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <err.h>
1010
#include <errno.h>
1111
#include <stdlib.h>
12+
#include <stdbool.h>
1213
#include <string.h>
1314
#include <unistd.h>
1415
#include <inttypes.h>

etc/template-subdir-library_h.j2

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <errno.h>
99
#include <stdlib.h>
1010
#include <string.h>
11+
#include <stdbool.h>
1112
#include <unistd.h>
1213
#include <inttypes.h>
1314
//////////////////////////////////////

etc/template-subdir-module_h.j2

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <err.h>
1010
#include <errno.h>
1111
#include <stdlib.h>
12+
#include <stdbool.h>
1213
#include <string.h>
1314
#include <unistd.h>
1415
#include <inttypes.h>

eventemitter-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ eventemitter_test_deps = [
1212
c_fsio_dep,
1313
c_stringfn_dep,
1414
ansi_codes_dep,
15-
logh_dep,
15+
log_dep,
1616
timestamp_dep,
1717
ms_dep,
1818
bytes_dep,

exec-fzf-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ exec_fzf_test_deps = [
2020
debug_memory_dep,
2121
c_string_buffer_dep,
2222
c_greatest_dep,
23-
logh_dep,
23+
log_dep,
2424
]
2525

2626
if get_option('enable-binaries')

exec-fzf/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ exec_fzf_deps = [
2121
ansi_utils_dep,
2222
#debug_memory_dep,
2323
c_string_buffer_dep,
24-
logh_dep,
24+
log_dep,
2525
]
2626

2727

expboff-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ expboff_test_deps = [
1313
c_fsio_dep,
1414
c_stringfn_dep,
1515
ansi_codes_dep,
16-
logh_dep,
16+
log_dep,
1717
timestamp_dep,
1818
ms_dep,
1919
bytes_dep,

font-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ font_test_deps = [
1313
font_dep,
1414
c_stringfn_dep,
1515
ansi_codes_dep,
16-
logh_dep,
16+
log_dep,
1717
timestamp_dep,
1818
]
1919
font_test_c_args = [

fort-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fort_test_deps = [
1616
c_string_buffer_dep,
1717
c_greatest_dep,
1818
ansi_codes_dep,
19-
logh_dep,
19+
log_dep,
2020
fort_dep,
2121
]
2222

generic-print-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ generic_print_test_deps = [
1313
c_fsio_dep,
1414
c_stringfn_dep,
1515
ansi_codes_dep,
16-
logh_dep,
16+
log_dep,
1717
timestamp_dep,
1818
]
1919
generic_print_test_c_args = [

genpassword-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ genpassword_test_deps = [
1313
c_fsio_dep,
1414
c_stringfn_dep,
1515
ansi_codes_dep,
16-
logh_dep,
16+
log_dep,
1717
timestamp_dep,
1818
]
1919
genpassword_test_c_args = [

go-libproc-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ go_libproc_test_deps = [
1313
go_libproc_dep,
1414
c_stringfn_dep,
1515
ansi_codes_dep,
16-
logh_dep,
16+
log_dep,
1717
timestamp_dep,
1818
]
1919
go_libproc_test_c_args = [

hexify-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ hexify_test_deps = [
1212
c_fsio_dep,
1313
c_stringfn_dep,
1414
ansi_codes_dep,
15-
logh_dep,
15+
log_dep,
1616
timestamp_dep,
1717
ms_dep,
1818
bytes_dep,

hmac-sha256-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ hmac_sha256_test_deps = [
1313
c_stringfn_dep,
1414
ansi_codes_dep,
1515
hmac_sha256_dep,
16-
logh_dep,
16+
log_dep,
1717
timestamp_dep,
1818
]
1919
hmac_sha256_test_c_args = [

http-get-test/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ http_get_test_deps = [
1313
http_get_dep,
1414
c_stringfn_dep,
1515
ansi_codes_dep,
16-
logh_dep,
16+
log_dep,
1717
timestamp_dep,
1818
]
1919
http_get_test_c_args = [

0 commit comments

Comments
 (0)