[nostalgia/studio] Update version to d2024.12.0

.gitattributes

@@ -1 +0,0 @@
-sample_project text eol=lf

.gitea/workflows/build.yaml

@@ -4,7 +4,7 @@ on: [push]
 
 jobs:
   build:
-    runs-on: olympic
+    runs-on: nostalgia
     steps:
       - name: Check out repository code
         uses: actions/checkout@v3
@@ -17,10 +17,3 @@ jobs:
       - run: make purge configure-release
       - run: make build
       - run: make test
-      - run: make install
-      - run: mv dist/linux-x86_64-release nostalgia-linux-x86_64
-      - run: tar cf nostalgia-linux-x86_64.tar nostalgia-linux-x86_64
-      - uses: actions/upload-artifact@v3
-        with:
-          name: nostalgia-linux-x86_64
-          path: nostalgia-linux-x86_64.tar

.gitignore

@@ -6,14 +6,12 @@
 .mypy_cache
 .stfolder
 .stignore
-.vs
-util/scripts/__pycache__
+scripts/__pycache__
 pyenv
 CMakeLists.txt.user
 ROM.oxfs
 Session.vim
 build
-cmake-build-*
 compile_commands.json
 dist
 graph_info.json

.liccor.yml

@@ -2,4 +2,4 @@
 source:
 - src
 copyright_notice: |-
-  Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
+  Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.

Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:41
+FROM fedora:36
 
 RUN dnf update -y
 

Makefile

@@ -1,49 +1,35 @@
 BC_VAR_PROJECT_NAME=nostalgia
 BC_VAR_PROJECT_NAME_CAP=Nostalgia
-BC_VAR_DEVENV_ROOT=util
 BUILDCORE_PATH=deps/buildcore
 include ${BUILDCORE_PATH}/base.mk
 
 ifeq ($(BC_VAR_OS),darwin)
-	PROJECT_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio.app/Contents/MacOS/${BC_VAR_PROJECT_NAME_CAP}Studio
+	NOSTALGIA_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio.app/Contents/MacOS/${BC_VAR_PROJECT_NAME_CAP}Studio
 	MGBA=/Applications/mGBA.app/Contents/MacOS/mGBA
 else
-	PROJECT_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio
+	NOSTALGIA_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio
 	MGBA=mgba-qt
 endif
-PROJECT_PLAYER=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}
 
 .PHONY: pkg-gba
 pkg-gba: build
-	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME_CAP}
+	${BC_CMD_ENVRUN} ${BC_PY3} ./scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME}
 
-.PHONY: pkg-mac
-pkg-mac: install
-	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-dmg.py NostalgiaStudio
-
-.PHONY: generate-studio-rsrc
-generate-studio-rsrc:
-	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/file-to-cpp.py --rsrc src/olympic/studio/applib/src/rsrc.json
-	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/file-to-cpp.py --rsrc src/nostalgia/studio/rsrc.json
-
-.PHONY: build-player
-build-player:
-	${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} ${BC_VAR_PROJECT_NAME_CAP}
 .PHONY: run
-run: build-player
-	${PROJECT_PLAYER} sample_project
+run: build
+	./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME} sample_project
 .PHONY: run-studio
 run-studio: build
-	${PROJECT_STUDIO}
+	${NOSTALGIA_STUDIO}
 .PHONY: gba-run
 gba-run: pkg-gba
-	${MGBA} ${BC_VAR_PROJECT_NAME_CAP}.gba
+	${MGBA} ${BC_VAR_PROJECT_NAME}.gba
 .PHONY: debug
 debug: build
-	${BC_CMD_HOST_DEBUGGER} ${PROJECT_PLAYER} sample_project
+	${BC_CMD_HOST_DEBUGGER} ./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME} sample_project
 .PHONY: debug-studio
 debug-studio: build
-	${BC_CMD_HOST_DEBUGGER} ${PROJECT_STUDIO}
+	${BC_CMD_HOST_DEBUGGER} ${NOSTALGIA_STUDIO}
 
 .PHONY: configure-gba
 configure-gba:
@@ -52,25 +38,3 @@ configure-gba:
 .PHONY: configure-gba-debug
 configure-gba-debug:
 	${BC_CMD_SETUP_BUILD} --toolchain=deps/gbabuildcore/cmake/modules/GBA.cmake --target=gba --current_build=0 --build_type=debug --build_root=${BC_VAR_BUILD_PATH}
-
-.PHONY: loc
-loc:
-	${BC_PY3} util/scripts/loc.py \
-		--search-dirs \
-			src \
-			deps/ox/src \
-			deps/buildcore \
-			deps/gbabuildcore \
-			deps/glutils \
-			deps/teagba \
-		--include-exts \
-			.cpp \
-			.hpp \
-			.py \
-			.s \
-			.cmake \
-		--exclude-paths \
-			deps/teagba/src/gba_crt0.s \
-			src/olympic/studio/applib/src/font.cpp \
-			src/olympic/studio/applib/src/font.hpp \
-			src/nostalgia/studio/icondata.cpp

deps/buildcore/base.mk

@@ -93,7 +93,7 @@ purge:
 	${BC_CMD_RM_RF} compile_commands.json
 .PHONY: test
 test: build
-	${BC_CMD_ENVRUN} ${BC_CMD_PY3} -m mypy ${BC_VAR_SCRIPTS}
+	${BC_CMD_ENVRUN} mypy ${BC_VAR_SCRIPTS}
 	${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} test
 .PHONY: test-verbose
 test-verbose: build

deps/buildcore/scripts/pybb.py

@@ -11,7 +11,6 @@
 # "Python Busy Box" - adds cross-platform equivalents to Unix commands that
 #                     don't translate well to that other operating system
 
-import multiprocessing
 import os
 import platform
 import shutil
@@ -58,11 +57,7 @@ def cmake_build(base_path: str, target: Optional[str]) -> int:
         path = os.path.join(base_path, d)
         if not os.path.isdir(path):
             continue
-        args = ['cmake', '--build', path, f'-j{multiprocessing.cpu_count()}']
-        if path.endswith('release'):
-            args.append('--config=release')
-        elif path.endswith('debug'):
-            args.append('--config=debug')
+        args = ['cmake', '--build', path]
         if target is not None:
             args.extend(['--target', target])
         err = subprocess.run(args).returncode

deps/buildcore/scripts/util.py

@@ -35,6 +35,4 @@ def get_arch() -> str:
     arch = platform.machine().lower()
     if arch == 'amd64':
         arch = 'x86_64'
-    elif arch == 'aarch64':
-        arch = 'arm64'
     return arch

deps/gbabuildcore/base.cmake

@@ -1,8 +1,8 @@
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake/modules)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdlib")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdinc++")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-unwind-tables")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-unwind-tables")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mthumb-interwork")

deps/glad/CMakeLists.txt

@@ -1,11 +1,2 @@
-add_library(glad src/glad.c)
-
-target_include_directories(glad PUBLIC include)
-
-install(
-	TARGETS
-		glad
-	DESTINATION
-		LIBRARY DESTINATION lib
-		ARCHIVE DESTINATION lib
-)
+add_library(glad OBJECT src/glad.c)
+target_include_directories(glad PUBLIC include)

deps/imgui/CMakeLists.txt

@@ -6,7 +6,7 @@ endif()
 # DrinkingTea: end
 
 add_library(
-	imgui
+	imgui OBJECT
 		imgui.cpp
 		imgui_demo.cpp
 		imgui_draw.cpp
@@ -19,12 +19,4 @@ add_library(
 target_include_directories(
 	imgui SYSTEM PUBLIC
 		.
-)
-
-install(
-	TARGETS
-		imgui
-	DESTINATION
-		LIBRARY DESTINATION lib
-		ARCHIVE DESTINATION lib
-)
+)

deps/nfde/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.5)
 project(nativefiledialog-extended VERSION 1.1.1)
 
 set(nfd_ROOT_PROJECT OFF)

deps/ox/.liccor.yml

@@ -2,7 +2,7 @@
 source:
 - src
 copyright_notice: |-
-  Copyright 2015 - 2025 gary@drinkingtea.net
+  Copyright 2015 - 2024 gary@drinkingtea.net
 
   This Source Code Form is subject to the terms of the Mozilla Public
   License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/deps/jsoncpp/CMakeLists.txt

@@ -12,7 +12,7 @@
 # CMake versions greater than the JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION policies will
 # continue to generate policy warnings "CMake Warning (dev)...Policy CMP0XXX is not set:"
 #
-set(JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION "3.13.2")
+set(JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION "3.8.0")
 set(JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION "3.13.2")
 cmake_minimum_required(VERSION ${JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION})
 if("${CMAKE_VERSION}" VERSION_LESS "${JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION}")

deps/ox/src/ox/clargs/clargs.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -29,7 +29,7 @@ ClArgs::ClArgs(ox::SpanView<const char*> args) noexcept {
 						m_bools[arg] = false;
 					}
 					m_strings[arg] = val;
-					if (auto r = ox::strToInt(val); r.error == 0) {
+					if (auto r = ox::atoi(val.c_str()); r.error == 0) {
 						m_ints[arg] = r.value;
 					}
 					++i;

deps/ox/src/ox/clargs/clargs.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/claw/claw.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/claw/format.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/claw/read.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -81,7 +81,7 @@ Result<ClawHeader> readClawHeader(ox::BufferView buff) noexcept {
 		return ox::Error(4, "Claw format does not match any supported format/version combo");
 	}
 	hdr.typeName = typeName;
-	std::ignore = ox::strToInt(versionStr).copyTo(hdr.typeVersion);
+	std::ignore = ox::atoi(versionStr).copyTo(hdr.typeVersion);
 	hdr.data = buffRaw;
 	hdr.dataSize = buffLen;
 	return hdr;

deps/ox/src/ox/claw/read.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/claw/readclaw.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/claw/test/tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/claw/write.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/claw/write.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -39,7 +39,7 @@ struct TypeInfoCatcher {
 	}
 
 	constexpr Error field(...) noexcept {
-		return {};
+		return ox::Error(0);
 	}
 
 	static constexpr auto opType() {

deps/ox/src/ox/event/event.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/event/signal.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/event/signal.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -143,11 +143,6 @@ class Signal {
 
 		Error disconnectObject(const void *receiver) const noexcept;
 
-		[[nodiscard]]
-		size_t connectionCnt() const noexcept {
-			return m_slots.size();
-		}
-
 		void emit(Args... args) const;
 
 		Error emitCheckError(Args... args) const noexcept;
@@ -218,9 +213,9 @@ Error Signal<Args...>::emitCheckError(Args... args) const noexcept {
 		for (auto &f : m_slots) {
 			f->call(args...);
 		}
-		return {};
+		return ox::Error(0);
 	} catch (const ox::Exception &ex) {
-		return ox::Error(ex.errCode, ex.msg, ex.src);
+		return ox::Error(ex.file, ex.line, ex.errCode, ex.msg);
 	}
 }
 
@@ -324,11 +319,6 @@ class Signal<Error(Args...)> {
 
 		Error disconnectObject(const void *receiver) const noexcept;
 
-		[[nodiscard]]
-		size_t connectionCnt() const noexcept {
-			return m_slots.size();
-		}
-
 		void emit(Args... args) const noexcept;
 
 		Error emitCheckError(Args... args) const noexcept;
@@ -410,7 +400,7 @@ Error Signal<Error(Args...)>::emitCheckError(Args... args) const noexcept {
 	for (auto &f : m_slots) {
 		OX_RETURN_ERROR(f->call(ox::forward<Args>(args)...));
 	}
-	return {};
+	return ox::Error(0);
 }
 
 }

deps/ox/src/ox/event/test/tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/fs/filestore/filestoretemplate.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/fs/filestore/filestoretemplate.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -230,7 +230,7 @@ template<typename size_t>
 Error FileStoreTemplate<size_t>::incLinks(uint64_t id) {
 	OX_REQUIRE_M(item, find(static_cast<size_t>(id)).validate());
 	++item->links;
-	return {};
+	return ox::Error(0);
 }
 
 template<typename size_t>
@@ -240,7 +240,7 @@ Error FileStoreTemplate<size_t>::decLinks(uint64_t id) {
 	if (item->links == 0) {
 		OX_RETURN_ERROR(remove(item));
 	}
-	return {};
+	return ox::Error(0);
 }
 
 template<typename size_t>
@@ -298,7 +298,7 @@ Error FileStoreTemplate<size_t>::write(uint64_t id64, const void *data, FsSize_t
 						        dest->id.get(), dest.offset(), destData.size());
 						fsData->rootNode = dest.offset();
 						oxTracef("ox.fs.FileStoreTemplate.write", "Root inode: {}", dest->id.get());
-						return {};
+						return ox::Error(0);
 					}
 				} else {
 					oxTrace("ox.fs.FileStoreTemplate.write.fail", "Could not place item due to absence of FileStore header.");
@@ -427,20 +427,20 @@ Error FileStoreTemplate<size_t>::resize() {
 	oxTracef("ox.fs.FileStoreTemplate.resize", "resize to: {}", newSize);
 	OX_RETURN_ERROR(m_buffer->setSize(newSize));
 	oxTracef("ox.fs.FileStoreTemplate.resize", "resized to: {}", m_buffer->size());
-	return {};
+	return ox::Error(0);
 }
 
 template<typename size_t>
 Error FileStoreTemplate<size_t>::resize(std::size_t size, void *newBuff) {
 	if (m_buffer->size() > size) {
-		return ox::Error{1, "new buffer is too small for existing data"};
+		return ox::Error(1);
 	}
 	m_buffSize = static_cast<size_t>(size);
 	if (newBuff) {
-		m_buffer = static_cast<Buffer*>(newBuff);
+		m_buffer = reinterpret_cast<Buffer*>(newBuff);
 		OX_RETURN_ERROR(m_buffer->setSize(static_cast<size_t>(size)));
 	}
-	return {};
+	return ox::Error(0);
 }
 
 template<typename size_t>
@@ -479,7 +479,7 @@ Error FileStoreTemplate<size_t>::walk(Error(*cb)(uint8_t, uint64_t, uint64_t)) {
 	for (auto i = m_buffer->iterator(); i.valid(); i.next()) {
 		OX_RETURN_ERROR(cb(i->fileType, i.ptr().offset(), i.ptr().end()));
 	}
-	return {};
+	return ox::Error(0);
 }
 
 template<typename size_t>
@@ -503,7 +503,7 @@ Error FileStoreTemplate<size_t>::compact() {
 	return m_buffer->compact([this, &isFirstItem](uint64_t oldAddr, ItemPtr item) -> Error {
 		if (isFirstItem) {
 			isFirstItem = false;
-			return {};
+			return ox::Error(0);
 		}
 		if (!item.valid()) {
 			return ox::Error(1);
@@ -524,7 +524,7 @@ Error FileStoreTemplate<size_t>::compact() {
 				parent->right = item;
 			}
 		}
-		return {};
+		return ox::Error(0);
 	});
 }
 
@@ -552,7 +552,7 @@ Error FileStoreTemplate<size_t>::placeItem(ItemPtr item) {
 		item->left = root->left;
 		item->right = root->right;
 		oxTracef("ox.fs.FileStoreTemplate.placeItem", "Overwrote Root Item: {}", item->id.get());
-		return {};
+		return ox::Error(0);
 	} else {
 		return placeItem(root, item);
 	}
@@ -573,7 +573,7 @@ Error FileStoreTemplate<size_t>::placeItem(ItemPtr root, ItemPtr item, int depth
 				item->right = right->right;
 			}
 			oxTracef("ox.fs.FileStoreTemplate.placeItem", "Placed Item: {}", item->id.get());
-			return {};
+			return ox::Error(0);
 		} else {
 			return placeItem(right, item, depth + 1);
 		}
@@ -586,7 +586,7 @@ Error FileStoreTemplate<size_t>::placeItem(ItemPtr root, ItemPtr item, int depth
 				item->right = left->right;
 			}
 			oxTracef("ox.fs.FileStoreTemplate.placeItem", "Placed Item: {}", item->id.get());
-			return {};
+			return ox::Error(0);
 		} else {
 			return placeItem(left, item, depth + 1);
 		}
@@ -624,7 +624,7 @@ Error FileStoreTemplate<size_t>::unplaceItem(ItemPtr item) {
 		} else {
 			fsData->rootNode = 0;
 		}
-		return {};
+		return ox::Error(0);
 	} else {
 		return unplaceItem(root, item);
 	}
@@ -661,7 +661,7 @@ Error FileStoreTemplate<size_t>::unplaceItem(ItemPtr root, ItemPtr item, int dep
 	if (item->left) {
 		OX_RETURN_ERROR(placeItem(m_buffer->ptr(item->left)));
 	}
-	return {};
+	return ox::Error(0);
 }
 
 template<typename size_t>
@@ -669,7 +669,7 @@ Error FileStoreTemplate<size_t>::remove(ItemPtr item) {
 	if (item.valid()) {
 		OX_RETURN_ERROR(unplaceItem(item));
 		OX_RETURN_ERROR(m_buffer->free(item));
-		return {};
+		return ox::Error(0);
 	}
 	return ox::Error(1);
 }

deps/ox/src/ox/fs/filesystem/directory.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/fs/filesystem/directory.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/fs/filesystem/filelocation.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -31,10 +31,10 @@ FileAddress::FileAddress(uint64_t inode) noexcept {
 FileAddress::FileAddress(ox::StringViewCR path) noexcept {
 	auto pathSize = path.bytes();
 	m_data.path = new char[pathSize + 1];
-	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	memcpy(m_data.path, path.data(), pathSize);
+OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage)
 	m_data.path[pathSize] = 0;
-	OX_ALLOW_UNSAFE_BUFFERS_END
+OX_CLANG_NOWARN_END
 	m_type = FileAddressType::Path;
 }
 
@@ -48,11 +48,9 @@ FileAddress &FileAddress::operator=(const FileAddress &other) noexcept {
 		case FileAddressType::Path:
 		{
 			if (other.m_data.path) {
-				OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 				auto strSize = ox::strlen(other.m_data.path) + 1;
 				m_data.path = new char[strSize];
 				ox::memcpy(m_data.path, other.m_data.path, strSize);
-				OX_ALLOW_UNSAFE_BUFFERS_END
 			} else {
 				m_data.constPath = "";
 				m_type = FileAddressType::ConstPath;

deps/ox/src/ox/fs/filesystem/filelocation.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -24,6 +24,9 @@ enum class FileAddressType: int8_t {
 	Inode,
 };
 
+template<typename T>
+constexpr Error model(T *h, CommonPtrWith<class FileAddress> auto *fa) noexcept;
+
 class FileAddress {
 
 	template<typename T>

deps/ox/src/ox/fs/filesystem/filesystem.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -37,30 +37,6 @@ Error FileSystem::read(const FileAddress &addr, void *buffer, std::size_t size)
 	}
 }
 
-Result<Buffer> FileSystem::read(FileAddress const &addr, size_t const size) noexcept {
-	Result<Buffer> out;
-	out.value.resize(size);
-	switch (addr.type()) {
-		case FileAddressType::Inode:
-			OX_RETURN_ERROR(readFileInode(addr.getInode().value, out.value.data(), size));
-			break;
-		case FileAddressType::ConstPath:
-		case FileAddressType::Path:
-			OX_RETURN_ERROR(readFilePath(StringView{addr.getPath().value}, out.value.data(), size));
-			break;
-		default:
-			return ox::Error{1};
-	}
-	return out;
-}
-
-Result<Buffer> FileSystem::read(StringViewCR path, size_t const size) noexcept {
-	Result<Buffer> out;
-	out.value.resize(size);
-	OX_RETURN_ERROR(readFilePath(path, out.value.data(), size));
-	return out;
-}
-
 Result<Buffer> FileSystem::read(const FileAddress &addr) noexcept {
 	OX_REQUIRE(s, stat(addr));
 	Buffer buff(static_cast<std::size_t>(s.size));
@@ -75,31 +51,28 @@ Result<Buffer> FileSystem::read(StringViewCR path) noexcept {
 	return buff;
 }
 
-Error FileSystem::read(
-		FileAddress const &addr,
-		std::size_t const readStart,
-		std::size_t const readSize,
-		void *buffer,
-		std::size_t *size) noexcept {
+Error FileSystem::read(const FileAddress &addr, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept {
 	switch (addr.type()) {
 		case FileAddressType::Inode:
-			return readFileInodeRange(addr.getInode().value, readStart, readSize, buffer, size);
+			return read(addr.getInode().value, readStart, readSize, buffer, size);
 		case FileAddressType::ConstPath:
 		case FileAddressType::Path:
-			return readFilePathRange(addr.getPath().value, readStart, readSize, buffer, size);
+			return ox::Error(2, "Unsupported for path lookups");
 		default:
 			return ox::Error(1);
 	}
 }
 
-Result<size_t> FileSystem::read(
-		StringViewCR path,
-		std::size_t const readStart,
-		std::size_t const readSize,
-		Span<char> buff) noexcept {
-	size_t szOut{buff.size()};
-	OX_RETURN_ERROR(readFilePathRange(path, readStart, readSize, buff.data(), &szOut));
-	return szOut;
+Error FileSystem::remove(const FileAddress &addr, bool recursive) noexcept {
+	switch (addr.type()) {
+		case FileAddressType::Inode:
+			return remove(addr.getInode().value, recursive);
+		case FileAddressType::ConstPath:
+		case FileAddressType::Path:
+			return remove(StringView(addr.getPath().value), recursive);
+		default:
+			return ox::Error(1);
+	}
 }
 
 Error FileSystem::write(const FileAddress &addr, const void *buffer, uint64_t size, FileType fileType) noexcept {

deps/ox/src/ox/fs/filesystem/filesystem.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -20,7 +20,7 @@
 namespace ox {
 
 namespace detail {
-inline void fsBuffFree(char *buff) noexcept {
+static inline void fsBuffFree(char *buff) noexcept {
 	safeDelete(buff);
 }
 }
@@ -41,45 +41,25 @@ class FileSystem {
 
 		Error read(const FileAddress &addr, void *buffer, std::size_t size) noexcept;
 
-		Result<Buffer> read(FileAddress const &addr, size_t size) noexcept;
-
-		Result<Buffer> read(StringViewCR path, size_t size) noexcept;
-
 		Result<Buffer> read(const FileAddress &addr) noexcept;
 
 		Result<Buffer> read(StringViewCR path) noexcept;
 
-		Error read(StringViewCR path, void *buffer, std::size_t buffSize) noexcept {
+		inline Error read(StringViewCR path, void *buffer, std::size_t buffSize) noexcept {
 			return readFilePath(path, buffer, buffSize);
 		}
 
-		Error read(uint64_t inode, void *buffer, std::size_t buffSize) noexcept {
+		inline Error read(uint64_t inode, void *buffer, std::size_t buffSize) noexcept {
 			return readFileInode(inode, buffer, buffSize);
 		}
 
-		Error read(
-			FileAddress const &addr,
-			size_t readStart,
-			size_t readSize,
-			void *buffer,
-			size_t *size) noexcept;
-
-		/**
-		 *
-		 * @param path
-		 * @param readStart
-		 * @param readSize
-		 * @param buff
-		 * @return error or number of bytes read
-		 */
-		Result<size_t> read(
-			StringViewCR path, size_t readStart, size_t readSize, ox::Span<char> buff) noexcept;
+		Error read(const FileAddress &addr, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept;
 
 		virtual Result<Vector<String>> ls(StringViewCR dir) const noexcept = 0;
 
-		Error remove(StringViewCR path, bool recursive = false) noexcept {
-			return removePath(path, recursive);
-		}
+		virtual Error remove(StringViewCR path, bool recursive) noexcept = 0;
+
+		Error remove(const FileAddress &addr, bool recursive = false) noexcept;
 
 		virtual Error resize(uint64_t size, void *buffer) noexcept = 0;
 
@@ -101,36 +81,36 @@ class FileSystem {
 
 		Error write(const FileAddress &addr, const void *buffer, uint64_t size, FileType fileType = FileType::NormalFile) noexcept;
 
-		Error write(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept {
+		inline Error write(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept {
 			return writeFilePath(path, buffer, size, fileType);
 		}
 
-		Error write(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
+		inline Error write(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
 			return writeFileInode(inode, buffer, size, fileType);
 		}
 
-		Result<FileStat> stat(uint64_t inode) const noexcept {
+		inline Result<FileStat> stat(uint64_t inode) const noexcept {
 			return statInode(inode);
 		}
 
-		Result<FileStat> stat(StringViewCR path) const noexcept {
+		inline Result<FileStat> stat(StringViewCR path) const noexcept {
 			return statPath(path);
 		}
 
 		Result<FileStat> stat(const FileAddress &addr) const noexcept;
 
 		[[nodiscard]]
-		bool exists(uint64_t inode) const noexcept {
+		inline bool exists(uint64_t inode) const noexcept {
 			return statInode(inode).ok();
 		}
 
 		[[nodiscard]]
-		bool exists(ox::StringView path) const noexcept {
+		inline bool exists(ox::StringView path) const noexcept {
 			return statPath(path).ok();
 		}
 
 		[[nodiscard]]
-		bool exists(FileAddress const&addr) const noexcept {
+		inline bool exists(FileAddress const&addr) const noexcept {
 			return stat(addr).ok();
 		}
 
@@ -160,12 +140,7 @@ class FileSystem {
 
 		virtual Error readFileInode(uint64_t inode, void *buffer, std::size_t size) noexcept = 0;
 
-		virtual Error readFilePathRange(
-			StringViewCR path, size_t readStart, size_t readSize, void *buffer, size_t *buffSize) noexcept = 0;
-
-		virtual Error readFileInodeRange(uint64_t inode, size_t readStart, size_t readSize, void *buffer, size_t *size) noexcept = 0;
-
-		virtual Error removePath(StringViewCR path, bool recursive) noexcept = 0;
+		virtual Error readFileInodeRange(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept = 0;
 
 		virtual Error writeFilePath(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept = 0;
 
@@ -177,11 +152,11 @@ class MemFS: public FileSystem {
 	public:
 		Result<const char*> directAccess(const FileAddress &addr) const noexcept;
 
-		Result<const char*> directAccess(StringViewCR path) const noexcept {
+		inline Result<const char*> directAccess(StringViewCR path) const noexcept {
 			return directAccessPath(path);
 		}
 
-		Result<const char*> directAccess(uint64_t inode) const noexcept {
+		inline Result<const char*> directAccess(uint64_t inode) const noexcept {
 			return directAccessInode(inode);
 		}
 
@@ -234,11 +209,6 @@ class FileSystemTemplate: public MemFS {
 
 		Error readFileInodeRange(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept override;
 
-		Error readFilePathRange(
-			StringViewCR path, size_t readStart, size_t readSize, void *buffer, size_t *buffSize) noexcept override;
-
-		Error removePath(StringViewCR path, bool recursive) noexcept override;
-
 		Result<const char*> directAccessInode(uint64_t) const noexcept override;
 
 		Result<Vector<String>> ls(StringViewCR dir) const noexcept override;
@@ -246,6 +216,8 @@ class FileSystemTemplate: public MemFS {
 		template<typename F>
 		Error ls(StringViewCR path, F cb) const;
 
+		Error remove(StringViewCR path, bool recursive) noexcept override;
+
 		/**
 		 * Resizes FileSystem to minimum possible size.
 		 */
@@ -329,7 +301,7 @@ Error FileSystemTemplate<FileStore, Directory>::format(void *buff, uint64_t buff
 		return ox::Error(1);
 	}
 
-	return {};
+	return ox::Error(0);
 }
 
 template<typename FileStore, typename Directory>
@@ -346,7 +318,7 @@ Error FileSystemTemplate<FileStore, Directory>::move(StringViewCR src, StringVie
 	OX_REQUIRE_M(inode, rootDir.find(src));
 	OX_RETURN_ERROR(rootDir.write(dest, inode));
 	OX_RETURN_ERROR(rootDir.remove(src));
-	return {};
+	return ox::Error(0);
 }
 
 template<typename FileStore, typename Directory>
@@ -385,14 +357,35 @@ Error FileSystemTemplate<FileStore, Directory>::readFileInodeRange(uint64_t inod
 }
 
 template<typename FileStore, typename Directory>
-Error FileSystemTemplate<FileStore, Directory>::readFilePathRange(
-	StringViewCR path, size_t readStart, size_t readSize, void *buffer, size_t *buffSize) noexcept {
-	OX_REQUIRE(s, stat(path));
-	return readFileInodeRange(s.inode, readStart, readSize, buffer, buffSize);
+Result<const char*> FileSystemTemplate<FileStore, Directory>::directAccessInode(uint64_t inode) const noexcept {
+	auto data = m_fs.read(inode);
+	if (!data.valid()) {
+		return ox::Error(1, "Data not valid");
+	}
+	return reinterpret_cast<char*>(data.get());
 }
 
 template<typename FileStore, typename Directory>
-Error FileSystemTemplate<FileStore, Directory>::removePath(StringViewCR path, bool recursive) noexcept {
+Result<Vector<String>> FileSystemTemplate<FileStore, Directory>::ls(StringViewCR path) const noexcept {
+	Vector<String> out;
+	OX_RETURN_ERROR(ls(path, [&out](StringViewCR name, typename FileStore::InodeId_t) {
+		out.emplace_back(name);
+		return ox::Error(0);
+	}));
+	return out;
+}
+
+template<typename FileStore, typename Directory>
+template<typename F>
+Error FileSystemTemplate<FileStore, Directory>::ls(StringViewCR path, F cb) const {
+	oxTracef("ox.fs.FileSystemTemplate.ls", "path: {}", path);
+	OX_REQUIRE(s, stat(path));
+	Directory dir(m_fs, s.inode);
+	return dir.ls(cb);
+}
+
+template<typename FileStore, typename Directory>
+Error FileSystemTemplate<FileStore, Directory>::remove(StringViewCR path, bool recursive) noexcept {
 	OX_REQUIRE(fd, fileSystemData());
 	Directory rootDir(m_fs, fd.rootDirInode);
 	OX_REQUIRE(inode, rootDir.find(path));
@@ -407,35 +400,7 @@ Error FileSystemTemplate<FileStore, Directory>::removePath(StringViewCR path, bo
 		oxTrace("FileSystemTemplate.remove.fail", "Tried to remove directory without recursive setting.");
 		return ox::Error(1);
 	}
-	return {};
-}
-
-template<typename FileStore, typename Directory>
-Result<const char*> FileSystemTemplate<FileStore, Directory>::directAccessInode(uint64_t inode) const noexcept {
-	auto data = m_fs.read(inode);
-	if (!data.valid()) {
-		return ox::Error(1, "Data not valid");
-	}
-	return reinterpret_cast<char*>(data.get());
-}
-
-template<typename FileStore, typename Directory>
-Result<Vector<String>> FileSystemTemplate<FileStore, Directory>::ls(StringViewCR path) const noexcept {
-	Vector<String> out;
-	OX_RETURN_ERROR(ls(path, [&out](StringViewCR name, typename FileStore::InodeId_t) {
-		out.emplace_back(name);
-		return ox::Error{};
-	}));
-	return out;
-}
-
-template<typename FileStore, typename Directory>
-template<typename F>
-Error FileSystemTemplate<FileStore, Directory>::ls(StringViewCR path, F cb) const {
-	oxTracef("ox.fs.FileSystemTemplate.ls", "path: {}", path);
-	OX_REQUIRE(s, stat(path));
-	Directory dir(m_fs, s.inode);
-	return dir.ls(cb);
+	return ox::Error(0);
 }
 
 template<typename FileStore, typename Directory>
@@ -468,7 +433,7 @@ Error FileSystemTemplate<FileStore, Directory>::writeFilePath(
 
 template<typename FileStore, typename Directory>
 Error FileSystemTemplate<FileStore, Directory>::writeFileInode(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
-	oxTrace("ox.fs.FileSystemTemplate.writeFileInode", ox::intToStr(inode));
+	oxTrace("ox.fs.FileSystemTemplate.writeFileInode", ox::itoa(inode));
 	return m_fs.write(inode, buffer, static_cast<size_t>(size), static_cast<uint8_t>(fileType));
 }
 

deps/ox/src/ox/fs/filesystem/passthroughfs.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -60,7 +60,7 @@ Error PassThroughFS::move(StringViewCR src, StringViewCR dest) noexcept {
 	if (ec.value()) {
 		return ox::Error(1);
 	}
-	return {};
+	return ox::Error(0);
 }
 
 Result<Vector<String>> PassThroughFS::ls(StringViewCR dir) const noexcept {
@@ -75,6 +75,14 @@ Result<Vector<String>> PassThroughFS::ls(StringViewCR dir) const noexcept {
 	return out;
 }
 
+Error PassThroughFS::remove(StringViewCR path, bool recursive) noexcept {
+	if (recursive) {
+		return ox::Error(std::filesystem::remove_all(m_path / stripSlash(path)) != 0);
+	} else {
+		return ox::Error(std::filesystem::remove(m_path / stripSlash(path)) != 0);
+	}
+}
+
 Error PassThroughFS::resize(uint64_t, void*) noexcept {
 	// unsupported
 	return ox::Error(1, "resize is not supported by PassThroughFS");
@@ -93,9 +101,7 @@ Result<FileStat> PassThroughFS::statPath(StringViewCR path) const noexcept {
 	oxTracef("ox.fs.PassThroughFS.statInode", "{} {}", ec.message(), path);
 	const uint64_t size = type == FileType::Directory ? 0 : std::filesystem::file_size(p, ec);
 	oxTracef("ox.fs.PassThroughFS.statInode.size", "{} {}", path, size);
-	if (auto err = ec.value()) {
-		return ox::Error{static_cast<ox::ErrorCode>(err), "PassThroughFS: stat failed"};
-	}
+	OX_RETURN_ERROR(ox::Error(static_cast<ox::ErrorCode>(ec.value()), "PassThroughFS: stat failed"));
 	return FileStat{0, 0, size, type};
 }
 
@@ -148,7 +154,7 @@ Error PassThroughFS::readFilePath(StringViewCR path, void *buffer, std::size_t b
 		oxTracef("ox.fs.PassThroughFS.read.error", "Read of {} failed: {}", path, f.what());
 		return ox::Error(2);
 	}
-	return {};
+	return ox::Error(0);
 }
 
 Error PassThroughFS::readFileInode(uint64_t, void*, std::size_t) noexcept {
@@ -156,38 +162,11 @@ Error PassThroughFS::readFileInode(uint64_t, void*, std::size_t) noexcept {
 	return ox::Error(1, "readFileInode(uint64_t, void*, std::size_t) is not supported by PassThroughFS");
 }
 
-Error PassThroughFS::readFilePathRange(
-	StringViewCR path, size_t const readStart, size_t readSize, void *buffer, size_t *buffSize) noexcept {
-	try {
-		std::ifstream file(m_path / stripSlash(path), std::ios::binary | std::ios::ate);
-		auto const size = static_cast<size_t>(file.tellg());
-		readSize = ox::min(readSize, size);
-		file.seekg(static_cast<off_t>(readStart), std::ios::beg);
-		if (readSize > *buffSize) {
-			oxTracef("ox.fs.PassThroughFS.read.error", "Read failed: Buffer too small: {}", path);
-			return ox::Error{1};
-		}
-		file.read(static_cast<char*>(buffer), static_cast<std::streamsize>(readSize));
-		return {};
-	} catch (std::fstream::failure const &f) {
-		oxTracef("ox.fs.PassThroughFS.read.error", "Read of {} failed: {}", path, f.what());
-		return ox::Error{2};
-	}
-}
-
 Error PassThroughFS::readFileInodeRange(uint64_t, std::size_t, std::size_t, void*, std::size_t*) noexcept {
 	// unsupported
 	return ox::Error(1, "read(uint64_t, std::size_t, std::size_t, void*, std::size_t*) is not supported by PassThroughFS");
 }
 
-Error PassThroughFS::removePath(StringViewCR path, bool const recursive) noexcept {
-	if (recursive) {
-		return ox::Error{std::filesystem::remove_all(m_path / stripSlash(path)) == 0};
-	} else {
-		return ox::Error{!std::filesystem::remove(m_path / stripSlash(path))};
-	}
-}
-
 Error PassThroughFS::writeFilePath(StringViewCR path, const void *buffer, uint64_t size, FileType) noexcept {
 	const auto p = (m_path / stripSlash(path));
 	try {
@@ -197,7 +176,7 @@ Error PassThroughFS::writeFilePath(StringViewCR path, const void *buffer, uint64
 		oxTracef("ox.fs.PassThroughFS.read.error", "Write of {} failed: {}", path, f.what());
 		return ox::Error(1);
 	}
-	return {};
+	return ox::Error(0);
 }
 
 Error PassThroughFS::writeFileInode(uint64_t, const void*, uint64_t, FileType) noexcept {
@@ -206,7 +185,8 @@ Error PassThroughFS::writeFileInode(uint64_t, const void*, uint64_t, FileType) n
 }
 
 std::string_view PassThroughFS::stripSlash(StringView path) noexcept {
-	for (auto i = 0u; i < path.len() && path[0] == '/'; i++) {
+	const auto pathLen = ox::strlen(path);
+	for (auto i = 0u; i < pathLen && path[0] == '/'; i++) {
 		path = substr(path, 1);
 	}
 	return {path.data(), path.bytes()};

deps/ox/src/ox/fs/filesystem/passthroughfs.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -45,6 +45,8 @@ class PassThroughFS: public FileSystem {
 		template<typename F>
 		Error ls(StringViewCR dir, F cb) const noexcept;
 
+		Error remove(StringViewCR path, bool recursive) noexcept override;
+
 		Error resize(uint64_t size, void *buffer) noexcept override;
 
 		Result<FileStat> statInode(uint64_t inode) const noexcept override;
@@ -71,13 +73,8 @@ class PassThroughFS: public FileSystem {
 
 		Error readFileInode(uint64_t inode, void *buffer, std::size_t size) noexcept override;
 
-		Error readFilePathRange(
-			StringViewCR path, size_t readStart, size_t readSize, void *buffer, size_t *buffSize) noexcept override;
-
 		Error readFileInodeRange(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept override;
 
-		Error removePath(StringViewCR path, bool recursive) noexcept override;
-
 		Error writeFilePath(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept override;
 
 		Error writeFileInode(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept override;
@@ -99,7 +96,7 @@ Error PassThroughFS::ls(StringViewCR dir, F cb) const noexcept {
 	for (auto &p : di) {
 		OX_RETURN_ERROR(cb(p.path().filename().c_str(), 0));
 	}
-	return {};
+	return ox::Error(0);
 }
 
 }

deps/ox/src/ox/fs/filesystem/pathiterator.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -36,7 +36,7 @@ Error PathIterator::dirPath(char *out, std::size_t outSize) {
 	if (idx >= 0 && size < outSize) {
 		ox::memcpy(out, m_path, size);
 		out[size] = 0;
-		return {};
+		return ox::Error(0);
 	} else {
 		return ox::Error(1);
 	}
@@ -85,7 +85,7 @@ Error PathIterator::next(StringView &fileName) {
 	std::size_t size = 0;
 	auto retval = ox::Error(1);
 	if (m_iterator < m_maxSize && ox::strlen(&m_path[m_iterator])) {
-		retval = {};
+		retval = ox::Error(0);
 		if (m_path[m_iterator] == '/') {
 			m_iterator++;
 		}
@@ -118,7 +118,7 @@ Result<std::size_t> PathIterator::nextSize() const {
 	auto retval = ox::Error(1);
 	auto it = m_iterator;
 	if (it < m_maxSize && ox::strlen(&m_path[it])) {
-		retval = {};
+		retval = ox::Error(0);
 		if (m_path[it] == '/') {
 			it++;
 		}

deps/ox/src/ox/fs/filesystem/pathiterator.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/fs/filesystem/types.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/fs/fs.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -354,7 +354,7 @@ Error NodeBuffer<size_t, Item>::free(ItemPtr item) noexcept {
 		}
 	}
 	m_header.bytesUsed -= item.size();
-	return {};
+	return ox::Error(0);
 }
 
 template<typename size_t, typename Item>
@@ -370,7 +370,7 @@ Error NodeBuffer<size_t, Item>::setSize(std::size_t size) noexcept {
 		m_header.size = static_cast<size_t>(size);
 		auto data = reinterpret_cast<uint8_t*>(this) + end;
 		ox::memset(data, 0, size - end);
-		return {};
+		return ox::Error(0);
 	}
 }
 
@@ -422,7 +422,7 @@ Error NodeBuffer<size_t, Item>::compact(F cb) noexcept {
 		src = ptr(dest->next);
 		dest = uninitializedPtr(dest.offset() + dest->fullSize());
 	}
-	return {};
+	return ox::Error(0);
 }
 
 template<typename size_t, typename Item>

deps/ox/src/ox/fs/ptrarith/ptr.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/fs/test/tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -119,9 +119,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 				auto constexpr path = ox::StringLiteral("/usr/share/charset.gbag");
 				ox::PathIterator it(path.c_str(), path.len());
 				auto buff = static_cast<char*>(ox_alloca(path.len() + 1));
-				OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 				oxAssert(it.dirPath(buff, path.len()) == 0 && ox::strcmp(buff, "/usr/share/") == 0, "PathIterator shows incorrect dir path");
-				OX_ALLOW_UNSAFE_BUFFERS_END
 				return ox::Error(0);
 			}
 		},
@@ -129,9 +127,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			"PathIterator::hasNext",
 			[](ox::StringView) {
 				const auto path = "/file1";
-				OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 				ox::PathIterator it(path, ox::strlen(path));
-				OX_ALLOW_UNSAFE_BUFFERS_END
 				oxAssert(it.hasNext(), "PathIterator shows incorrect hasNext");
 				oxAssert(!it.next().hasNext(), "PathIterator shows incorrect hasNext");
 				return ox::Error(0);
@@ -167,11 +163,9 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			[](ox::StringView) {
 				constexpr auto buffLen = 5000;
 				constexpr auto str1 = "Hello, World!";
-				OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 				constexpr auto str1Len = ox::strlen(str1) + 1;
 				constexpr auto str2 = "Hello, Moon!";
 				constexpr auto str2Len = ox::strlen(str2) + 1;
-				OX_ALLOW_UNSAFE_BUFFERS_END
 				auto list = new (ox_alloca(buffLen)) ox::ptrarith::NodeBuffer<uint32_t, ox::FileStoreItem<uint32_t>>(buffLen);
 				oxAssert(ox::FileStore32::format(list, buffLen), "FileStore::format failed.");
 				ox::FileStore32 fileStore(list, buffLen);

deps/ox/src/ox/fs/tool.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -48,7 +48,7 @@ static ox::Error runLs(ox::FileSystem *fs, ox::Span<const char*> args) noexcept
 	for (const auto &file : files) {
 		oxOutf("{}\n", file);
 	}
-	return {};
+	return ox::Error(0);
 }
 
 static ox::Error runRead(ox::FileSystem *fs, ox::Span<const char*> args) noexcept {
@@ -57,10 +57,8 @@ static ox::Error runRead(ox::FileSystem *fs, ox::Span<const char*> args) noexcep
 		return ox::Error(1);
 	}
 	OX_REQUIRE(buff, fs->read(ox::StringView(args[1])));
-	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	std::ignore = fwrite(buff.data(), sizeof(decltype(buff)::value_type), buff.size(), stdout);
-	OX_ALLOW_UNSAFE_BUFFERS_END
-	return {};
+	return ox::Error(0);
 }
 
 static ox::Error run(int argc, const char **argv) noexcept {

deps/ox/src/ox/logconn/circularbuff.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/logconn/def.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,7 +14,7 @@
     { \
 		const auto loggerErr = (loggerName).initConn(appName); \
 		if (loggerErr) { \
-			oxErrf("Could not connect to logger: {} ({}:{})\n", toStr(loggerErr), loggerErr.src.file_name(), loggerErr.src.line()); \
+			oxErrf("Could not connect to logger: {} ({}:{})\n", toStr(loggerErr), loggerErr.file, loggerErr.line); \
 		} else { \
 			ox::trace::setLogger(&(loggerName)); \
 		} \

deps/ox/src/ox/logconn/logconn.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -91,28 +91,23 @@ ox::Error LoggerConn::sendInit(const InitTraceMsg &msg) noexcept {
 }
 
 void LoggerConn::msgSend() noexcept {
-	try {
+	while (true) {
+		std::unique_lock lk(m_waitMut);
+		m_waitCond.wait(lk);
+		if (!m_running) {
+			break;
+		}
+		std::lock_guard const buffLk(m_buffMut);
 		while (true) {
-			std::unique_lock lk(m_waitMut);
-			m_waitCond.wait(lk);
-			if (!m_running) {
+			Array<char, units::KB> tmp;
+			const auto read = m_buff.read(tmp.data(), tmp.size());
+			if (!read) {
 				break;
 			}
-			std::lock_guard const buffLk(m_buffMut);
-			while (true) {
-				Array<char, units::KB> tmp;
-				const auto read = m_buff.read(tmp.data(), tmp.size());
-				if (!read) {
-					break;
-				}
-				oxAssert(read <= tmp.size(), "logger trying to read too much data");
-				//std::printf("LoggerConn: sending %lu bytes\n", read);
-				std::ignore = send(tmp.data(), read);
-			}
+			oxAssert(read <= tmp.size(), "logger trying to read too much data");
+			//std::printf("LoggerConn: sending %lu bytes\n", read);
+			std::ignore = send(tmp.data(), read);
 		}
-	} catch (std::exception const &e) {
-		oxErrf("Exception in logger thread: {}\n", e.what());
-		oxAssert(false, "logger thread exception");
 	}
 }
 

deps/ox/src/ox/logconn/logconn.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/mc/err.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/mc/intops.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -71,9 +71,7 @@ constexpr McInt encodeInteger(I pInput) noexcept {
 	// move input to uint64_t to allow consistent bit manipulation, and to avoid
 	// overflow concerns
 	uint64_t val = 0;
-	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	ox::memcpy(&val, &input, sizeof(input));
-	OX_ALLOW_UNSAFE_BUFFERS_END
 	if (val) {
 		// bits needed to represent number factoring in space possibly
 		// needed for signed bit
@@ -96,9 +94,7 @@ constexpr McInt encodeInteger(I pInput) noexcept {
 		}
 		if (bytes == 9) {
 			out.data[0] = bytesIndicator;
-			OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 			ox::memcpy(&out.data[1], &leVal, 8);
-			OX_ALLOW_UNSAFE_BUFFERS_END
 			if (inputNegative) {
 				out.data[1] |= 0b1000'0000;
 			}
@@ -108,9 +104,7 @@ constexpr McInt encodeInteger(I pInput) noexcept {
 			auto intermediate =
 				static_cast<uint64_t>(leVal.raw() | (negBit << (valBits - 1))) << bytes |
 				static_cast<uint64_t>(bytesIndicator);
-			OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 			ox::memcpy(&out.data[0], &intermediate, sizeof(intermediate));
-			OX_ALLOW_UNSAFE_BUFFERS_END
 		}
 		out.length = bytes;
 	}
@@ -157,37 +151,33 @@ constexpr Result<I> decodeInteger(Reader_c auto&rdr, std::size_t *bytesRead) noe
 	decoded >>= bytes;
 	// move sign bit
 	if constexpr(is_signed_v<I>) {
-		const auto negBit = bytes * 8 - bytes - 1;
-		// move sign
-		const auto negative = (decoded >> negBit) == 1;
-		if (negative) {
-			// fill in all bits between encoded sign and real sign with 1s
-			// split it up because the 32-bit ARM can't shift more than 32 bits
-			ox::Array<uint32_t, 2> d = {};
-			//d[0] = decoded & 0xffff'ffff;
-			//d[1] = decoded >> 32;
-		 	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-			ox::memcpy(&d[0], &decoded, sizeof(decoded));
-		 	OX_ALLOW_UNSAFE_BUFFERS_END
-			auto bit = negBit;
-			for (; bit < ox::min<std::size_t>(Bits<I>, 32); ++bit) {
-				d[0] |= 1 << bit;
-			}
-			bit -= 32;
-			for (; bit < Bits<I>; ++bit) {
-				d[1] |= 1 << bit;
-			}
-			I out = 0;
-			if constexpr(ox::defines::BigEndian) {
-				const auto d0Tmp = d[0];
-				d[0] = d[1];
-				d[1] = d0Tmp;
-			}
-		 	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-			ox::memcpy(&out, &d[0], sizeof(out));
-			OX_ALLOW_UNSAFE_BUFFERS_END
-			return out;
-		}
+		 const auto negBit = bytes * 8 - bytes - 1;
+		 // move sign
+		 const auto negative = (decoded >> negBit) == 1;
+		 if (negative) {
+			 // fill in all bits between encoded sign and real sign with 1s
+			 // split it up because the 32-bit ARM can't shift more than 32 bits
+			 ox::Array<uint32_t, 2> d = {};
+			 //d[0] = decoded & 0xffff'ffff;
+			 //d[1] = decoded >> 32;
+			 ox::memcpy(&d[0], &decoded, sizeof(decoded));
+			 auto bit = negBit;
+			 for (; bit < ox::min<std::size_t>(Bits<I>, 32); ++bit) {
+				 d[0] |= 1 << bit;
+			 }
+			 bit -= 32;
+			 for (; bit < Bits<I>; ++bit) {
+				 d[1] |= 1 << bit;
+			 }
+			 I out = 0;
+			 if constexpr(ox::defines::BigEndian) {
+				 const auto d0Tmp = d[0];
+				 d[0] = d[1];
+				 d[1] = d0Tmp;
+			 }
+			 ox::memcpy(&out, &d[0], sizeof(out));
+			 return out;
+		 }
 	}
 	return static_cast<I>(decoded);
 }

deps/ox/src/ox/mc/mc.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/mc/presenceindicator.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/mc/presenceindicator.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/mc/read.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/mc/read.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -197,7 +197,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, bool *val) n
 		OX_RETURN_ERROR(result);
 	}
 	++m_field;
-	return {};
+	return ox::Error(0);
 }
 
 // array handler
@@ -256,7 +256,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, HashMap<Stri
 		}
 	}
 	++m_field;
-	return {};
+	return ox::Error(0);
 }
 
 template<Reader_c Reader>
@@ -330,7 +330,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, BasicString<
 		}
 	}
 	++m_field;
-	return {};
+	return ox::Error(0);
 }
 
 template<Reader_c Reader>
@@ -370,7 +370,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char
 		data[size] = 0;
 	}
 	++m_field;
-	return {};
+	return ox::Error(0);
 }
 
 template<Reader_c Reader>
@@ -388,7 +388,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char
 		data[size] = 0;
 	}
 	++m_field;
-	return {};
+	return ox::Error(0);
 }
 
 template<Reader_c Reader>
@@ -416,7 +416,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char
 		}
 	}
 	++m_field;
-	return {};
+	return ox::Error(0);
 }
 
 template<Reader_c Reader>
@@ -464,7 +464,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::readInteger(I *val) noexcept {
 		}
 	}
 	++m_field;
-	return {};
+	return ox::Error(0);
 }
 
 template<Reader_c Reader>
@@ -487,7 +487,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, CB cb) noexc
 		}
 	}
 	++m_field;
-	return {};
+	return ox::Error(0);
 }
 
 template<Reader_c Reader>

deps/ox/src/ox/mc/test/tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/mc/types.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/mc/write.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/mc/write.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -122,7 +122,7 @@ class MetalClawWriter {
 			}
 			OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 			++m_field;
-			return {};
+			return ox::Error(0);
 		}
 
 };
@@ -184,7 +184,7 @@ constexpr Error MetalClawWriter<Writer>::field(const char*, const bool *val) noe
 		OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), *val));
 	}
 	++m_field;
-	return {};
+	return ox::Error(0);
 }
 
 template<Writer_c Writer>
@@ -201,7 +201,7 @@ constexpr Error MetalClawWriter<Writer>::field(const char*, const BasicString<Sm
 	}
 	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return {};
+	return ox::Error(0);
 }
 
 template<Writer_c Writer>
@@ -214,12 +214,7 @@ template<Writer_c Writer>
 constexpr Error MetalClawWriter<Writer>::fieldCString(const char*, const char *const*val, std::size_t) noexcept {
 	bool fieldSet = false;
 	if (!m_unionIdx.has_value() || *m_unionIdx == m_field) {
-		OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-		// this strlen is tolerated because sometimes 0 gets passed to
-		// the size param, which is a lie
-		// this code should be cleaned up at some point...
 		const auto strLen = *val ? ox::strlen(*val) : 0;
-		OX_ALLOW_UNSAFE_BUFFERS_END
 		// write the length
 		const auto strLenBuff = mc::encodeInteger(strLen);
 		OX_RETURN_ERROR(m_writer.write(reinterpret_cast<const char*>(strLenBuff.data.data()), strLenBuff.length));
@@ -229,7 +224,7 @@ constexpr Error MetalClawWriter<Writer>::fieldCString(const char*, const char *c
 	}
 	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return {};
+	return ox::Error(0);
 }
 
 template<Writer_c Writer>
@@ -255,7 +250,7 @@ constexpr Error MetalClawWriter<Writer>::fieldCString(const char*, const char *v
 	}
 	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return {};
+	return ox::Error(0);
 }
 
 template<Writer_c Writer>
@@ -319,7 +314,7 @@ OX_ALLOW_UNSAFE_BUFFERS_END
 	}
 	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return {};
+	return ox::Error(0);
 }
 
 template<Writer_c Writer>
@@ -356,7 +351,7 @@ constexpr Error MetalClawWriter<Writer>::field(const char*, const HashMap<String
 	}
 	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return {};
+	return ox::Error(0);
 }
 
 template<Writer_c Writer>

deps/ox/src/ox/model/def.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -13,7 +13,7 @@
 // oxModelFwdDecl is necessary because Apple-Clang is broken...
 #define OX_MODEL_FWD_DECL(modelName) constexpr ox::Error model(auto *io, ox::CommonPtrWith<modelName> auto *o) noexcept
 #define OX_MODEL_BEGIN(modelName) constexpr ox::Error model(auto *io, [[maybe_unused]] ox::CommonPtrWith<modelName> auto *o) noexcept { OX_RETURN_ERROR(io->template setTypeInfo<modelName>());
-#define OX_MODEL_END() return {}; }
+#define OX_MODEL_END() return ox::Error(0); }
 #define OX_MODEL_FIELD(fieldName) OX_RETURN_ERROR(io->field(#fieldName, &o->fieldName));
 #define OX_MODEL_FIELD_RENAME(objFieldName, serFieldName) OX_RETURN_ERROR(io->field(#serFieldName, &o->objFieldName));
 #define OX_MODEL_FRIEND(modelName) friend constexpr ox::Error model(auto *io, ox::CommonPtrWith<modelName> auto *o) noexcept

deps/ox/src/ox/model/descread.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/model/desctypes.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/model/desctypes.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -244,7 +244,7 @@ constexpr Error model(TypeDescReader<T> *io, CommonPtrWith<DescriptorField> auto
 	// defaultValue is unused now, but placeholder for backwards compatibility
 	int defaultValue = 0;
 	oxReturnError(io->field("defaultValue", &defaultValue));
-	return {};
+	return ox::Error(0);
 }
 #endif
 

deps/ox/src/ox/model/descwrite.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/model/descwrite.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -205,7 +205,7 @@ constexpr Error TypeDescWriter::field(StringViewCR name, T const*, std::size_t,
 		const auto t = type(p);
 		oxAssert(t != nullptr, "field(const char *name, T *val, std::size_t): Type not found or generated");
 		m_type->fieldList.emplace_back(t, String(name), detail::indirectionLevels_v<T> + 1, subscriptStack, buildTypeId(*t));
-		return {};
+		return ox::Error(0);
 	}
 	return ox::Error(1);
 }
@@ -220,7 +220,7 @@ constexpr Error TypeDescWriter::field(StringViewCR name, T const*, std::size_t)
 		auto const lvls = detail::indirectionLevels_v<T> + 1;
 		SubscriptStack subscriptStack{lvls};
 		m_type->fieldList.emplace_back(t, String(name), lvls, subscriptStack, buildTypeId(*t));
-		return {};
+		return ox::Error(0);
 	}
 	return ox::Error(1);
 }
@@ -231,7 +231,7 @@ constexpr Error TypeDescWriter::field(StringViewCR name, UnionView<T, force> val
 		const auto t = type(val);
 		oxAssert(t != nullptr, "field(const char *name, T val): Type not found or generated");
 		m_type->fieldList.emplace_back(t, String(name), 0, SubscriptStack{}, ox::String(t->typeName));
-		return {};
+		return ox::Error(0);
 	}
 	return ox::Error(1);
 }

deps/ox/src/ox/model/fieldcounter.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -31,25 +31,25 @@ class FieldCounter {
 		template<typename U>
 		constexpr ox::Error field(StringViewCR, U) noexcept {
 			++fields;
-			return {};
+			return ox::Error(0);
 		}
 
 		template<typename U>
 		constexpr ox::Error field(StringViewCR, U, std::size_t) noexcept {
 			++fields;
-			return {};
+			return ox::Error(0);
 		}
 
 		template<typename U, typename Handler>
 		constexpr Error field(StringViewCR, Handler) {
 			++fields;
-			return {};
+			return ox::Error(0);
 		}
 
 		template<typename ...Args>
 		constexpr Error fieldCString(Args&&...) noexcept {
 			++fields;
-			return {};
+			return ox::Error(0);
 		}
 
 		static constexpr auto opType() noexcept {

deps/ox/src/ox/model/metadata.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/model/model.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/model/modelhandleradaptor.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/model/modelops.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -56,19 +56,19 @@ class MemberList {
 		template<typename T>
 		constexpr Error field(const char*, T *v) noexcept {
 			vars[m_i++] = static_cast<void*>(v);
-			return {};
+			return ox::Error(0);
 		}
 
 		template<typename T>
 		constexpr Error field(const char*, T *v, int) noexcept {
 			vars[m_i++] = static_cast<void*>(v);
-			return {};
+			return ox::Error(0);
 		}
 
 		template<typename U, bool force = false>
 		constexpr Error field(const char*, UnionView<U, force> u) noexcept {
 			vars[m_i++] = static_cast<void*>(u.get());
-			return {};
+			return ox::Error(0);
 		}
 
 		template<typename T>
@@ -107,7 +107,7 @@ class Copier {
 				auto &dst = *cbit_cast<FT*>(m_dst->vars[m_i]);
 				dst = src;
 				++m_i;
-				return {};
+				return ox::Error(0);
 			}
 		}
 
@@ -119,7 +119,7 @@ class Copier {
 				dst = src;
 			}
 			++m_i;
-			return {};
+			return ox::Error(0);
 		}
 
 		template<typename U, bool force = false>
@@ -128,7 +128,7 @@ class Copier {
 			auto &src = *u.get();
 			dst = src;
 			++m_i;
-			return {};
+			return ox::Error(0);
 		}
 
 		template<typename T = void>
@@ -168,7 +168,7 @@ class Mover {
 				dst = std::move(src);
 				src = FT{};
 				++m_i;
-				return {};
+				return ox::Error(0);
 			}
 		}
 
@@ -181,7 +181,7 @@ class Mover {
 				src = FT{};
 			}
 			++m_i;
-			return {};
+			return ox::Error(0);
 		}
 
 		template<typename U, bool force = false>
@@ -190,7 +190,7 @@ class Mover {
 			auto &src = *u.get();
 			dst = std::move(src);
 			++m_i;
-			return {};
+			return ox::Error(0);
 		}
 
 		template<typename T = void>
@@ -228,7 +228,7 @@ class Equals {
 			const auto &dst = std::bit_cast<FT>(*m_other->vars[m_i]);
 			++m_i;
 			if (dst == src) {
-				return {};
+				return ox::Error(0);
 			} else {
 				this->value = false;
 				return ox::Error(1);
@@ -246,7 +246,7 @@ class Equals {
 				}
 			}
 			++m_i;
-			return {};
+			return ox::Error(0);
 		}
 
 		template<typename U, bool force = false>
@@ -255,7 +255,7 @@ class Equals {
 			const auto &src = *u.get();
 			++m_i;
 			if (dst == src) {
-				return {};
+				return ox::Error(0);
 			} else {
 				this->value = false;
 				return ox::Error(1);

deps/ox/src/ox/model/modelvalue.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -18,6 +18,6 @@ static_assert([]() -> ox::Error {
 	}
 	//oxReturnError(v.set<int32_t>(5));
 	return {};
-}() == ox::Error{});
+}() == ox::Error(0));
 
 }

deps/ox/src/ox/model/modelvalue.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -972,7 +972,7 @@ constexpr Error model(auto *h, CommonPtrWith<ModelObject> auto *obj) noexcept {
 	for (auto &f : obj->m_fieldsOrder) {
 		OX_RETURN_ERROR(h->field(f->name.c_str(), &f->value));
 	}
-	return {};
+	return ox::Error(0);
 }
 
 constexpr Error model(auto *h, CommonPtrWith<ModelUnion> auto *obj) noexcept {
@@ -981,7 +981,7 @@ constexpr Error model(auto *h, CommonPtrWith<ModelUnion> auto *obj) noexcept {
 	for (auto &f : obj->m_fieldsOrder) {
 		OX_RETURN_ERROR(h->field(f->name.c_str(), &f->value));
 	}
-	return {};
+	return ox::Error(0);
 }
 
 constexpr ModelValue::ModelValue(const ModelValue &other) noexcept {
@@ -997,7 +997,7 @@ constexpr ModelValue::ModelValue(const ModelValue &other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			m_data = other.m_data;
+			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
 			break;
 		case Type::String:
 			m_data.str = new String(other.get<String>());
@@ -1030,8 +1030,8 @@ constexpr ModelValue::ModelValue(ModelValue &&other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			m_data = other.m_data;
-			other.m_data.ui64 = 0;
+			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
+			ox::memset(&other.m_data, 0, sizeof(m_data));
 			break;
 		case Type::String:
 			m_data.str = other.m_data.str;
@@ -1129,7 +1129,7 @@ constexpr Error ModelValue::setType(
 		OX_RETURN_ERROR(m_data.uni->setType(type));
 	}
 	oxAssert(m_type != Type::Undefined, "No type set");
-	return {};
+	return ox::Error(0);
 }
 
 template<typename T>
@@ -1184,7 +1184,7 @@ constexpr Error ModelValue::set(const T &v) noexcept {
 		safeDelete(&value);
 	}
 	value = v;
-	return {};
+	return ox::Error(0);
 }
 
 template<typename T>
@@ -1199,7 +1199,7 @@ constexpr Error ModelValue::set(T &&v) noexcept {
 		safeDelete(&value);
 	}
 	value = std::move(v);
-	return {};
+	return ox::Error(0);
 }
 
 constexpr ModelValue &ModelValue::operator=(ModelValue &other) noexcept {
@@ -1223,7 +1223,7 @@ constexpr ModelValue &ModelValue::operator=(const ModelValue &other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			m_data = other.m_data;
+			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
 			break;
 		case Type::String:
 			m_data.str = new String(other.get<String>());
@@ -1261,8 +1261,8 @@ constexpr ModelValue &ModelValue::operator=(ModelValue &&other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			m_data = other.m_data;
-			other.m_data = {};
+			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
+			ox::memset(&other.m_data, 0, sizeof(m_data));
 			break;
 		case Type::String:
 			m_data.str = other.m_data.str;

deps/ox/src/ox/model/optype.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/model/test/tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/model/typenamecatcher.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -38,17 +38,17 @@ struct TypeNameCatcher {
 
 	template<typename T>
 	constexpr Error field(const char*, T*, std::size_t) noexcept {
-		return {};
+		return ox::Error(0);
 	}
 
 	template<typename T>
 	constexpr Error field(const char*, T) noexcept {
-		return {};
+		return ox::Error(0);
 	}
 
 	template<typename ...Args>
 	constexpr Error fieldCString(Args&&...) noexcept {
-		return {};
+		return ox::Error(0);
 	}
 
 	static constexpr auto opType() noexcept {
@@ -77,17 +77,17 @@ struct TypeInfoCatcher {
 
 	template<typename T>
 	constexpr Error field(const char*, T*, std::size_t) noexcept {
-		return {};
+		return ox::Error(0);
 	}
 
 	template<typename T>
 	constexpr Error field(const char*, T) noexcept {
-		return {};
+		return ox::Error(0);
 	}
 
 	template<typename T>
 	constexpr Error fieldCString(const char*, T) noexcept {
-		return {};
+		return ox::Error(0);
 	}
 
 	static constexpr auto opType() noexcept {
@@ -140,16 +140,16 @@ constexpr Str getModelTypeName() noexcept {
 	return out;
 }
 
-template<typename T, typename Str = const char*>
+template<typename T>
 [[nodiscard]]
 consteval auto requireModelTypeName() noexcept {
-	constexpr auto name = getModelTypeName<T, Str>();
+	constexpr auto name = getModelTypeName<T>();
 	static_assert(ox::StringView{name}.len(), "Type lacks required TypeName");
 	return name;
 }
 
 template<typename T, typename Str = const char*>
-constexpr auto ModelTypeName_v = requireModelTypeName<T, Str>();
+constexpr auto ModelTypeName_v = getModelTypeName<T, Str>();
 
 template<typename T, typename Str = const char*>
 constexpr auto ModelTypeVersion_v = requireModelTypeVersion<T>();

deps/ox/src/ox/model/types.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/model/typestore.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -58,11 +58,7 @@ class TypeStore {
 				if (!std::is_constant_evaluated()) {
 					OX_REQUIRE_M(dt, loadDescriptor(typeId));
 					for (auto &f : dt->fieldList) {
-						if (typeId == f.typeId) {
-							f.type = dt.get();
-						} else {
-							OX_RETURN_ERROR(this->getLoad(f.typeId).moveTo(f.type));
-						}
+						OX_RETURN_ERROR(this->getLoad(f.typeId).moveTo(f.type));
 					}
 					auto &out = m_cache[typeId];
 					out = std::move(dt);

deps/ox/src/ox/model/walk.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -127,7 +127,7 @@ static constexpr Error parseField(const DescriptorField &field, Reader *rdr, Dat
 		}
 	}
 	walker->popNamePath();
-	return {};
+	return ox::Error(0);
 }
 
 template<typename Reader, typename FH>
@@ -141,7 +141,7 @@ constexpr Error model(Reader *rdr, DataWalker<Reader, FH> *walker) noexcept {
 	for (const auto &field : fields) {
 		OX_RETURN_ERROR(parseField(field, rdr, walker));
 	}
-	return {};
+	return ox::Error(0);
 }
 
 template<typename Reader, typename Handler>

deps/ox/src/ox/oc/oc.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/oc/read.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -15,7 +15,7 @@ namespace ox {
 
 OrganicClawReader::OrganicClawReader(const uint8_t *buff, std::size_t buffSize) {
 	auto json = reinterpret_cast<const char*>(buff);
-	auto jsonLen = ox::strnlen_s(json, buffSize);
+	auto jsonLen = ox::strnlen(json, buffSize);
 	Json::CharReaderBuilder parserBuilder;
 	auto parser = std::unique_ptr<Json::CharReader>(parserBuilder.newCharReader());
 	if (!parser->parse(json, json + jsonLen, &m_json, nullptr)) {
@@ -37,7 +37,7 @@ OrganicClawReader::OrganicClawReader(Json::Value json, int unionIdx) noexcept:
 }
 
 Error OrganicClawReader::field(const char *key, bool *val) noexcept {
-	ox::Error err{};
+	auto err = ox::Error(0);
 	if (targetValid()) {
 		const auto &jv = value(key);
 		if (jv.empty()) {
@@ -53,7 +53,7 @@ Error OrganicClawReader::field(const char *key, bool *val) noexcept {
 }
 
 Error OrganicClawReader::fieldCString(const char *key, char *val, std::size_t buffLen) noexcept {
-	ox::Error err{};
+	auto err = ox::Error(0);
 	const char *begin = nullptr, *end = nullptr;
 	const auto &jv = value(key);
 	if (targetValid()) {
@@ -81,7 +81,7 @@ Error OrganicClawReader::fieldCString(const char *key, char *val, std::size_t bu
 }
 
 Error OrganicClawReader::fieldCString(const char *key, char **val) noexcept {
-	ox::Error err{};
+	auto err = ox::Error(0);
 	const char *begin = nullptr, *end = nullptr;
 	const auto &jv = value(key);
 	auto &data = *val;
@@ -106,7 +106,7 @@ Error OrganicClawReader::fieldCString(const char *key, char **val) noexcept {
 }
 
 Error OrganicClawReader::fieldCString(const char *key, char **val, std::size_t buffLen) noexcept {
-	ox::Error err{};
+	auto err = ox::Error(0);
 	const char *begin = nullptr, *end = nullptr;
 	const auto &jv = value(key);
 	if (targetValid()) {

deps/ox/src/ox/oc/read.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,11 +8,7 @@
 
 #pragma once
 
-#include <ox/std/def.hpp>
-
-OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 #include <json/json.h>
-OX_ALLOW_UNSAFE_BUFFERS_END
 
 #include <ox/model/fieldcounter.hpp>
 #include <ox/model/modelhandleradaptor.hpp>
@@ -137,7 +133,7 @@ class OrganicClawReader {
 
 template<typename T>
 Error OrganicClawReader::field(const char *key, T *val) noexcept {
-	ox::Error err{};
+	auto err = ox::Error(0);
 	try {
 		if constexpr (is_integer_v<T>) {
 			if (targetValid()) {
@@ -148,11 +144,7 @@ Error OrganicClawReader::field(const char *key, T *val) noexcept {
 				if (jv.empty()) {
 					*val = 0;
 				} else if (rightType) {
-					if constexpr(ox::is_signed_v<T>) {
-						*val = static_cast<T>(jv.asInt64());
-					} else {
-						*val = static_cast<T>(jv.asUInt64());
-					}
+					*val = static_cast<T>(jv.asUInt());
 				} else {
 					err = ox::Error(1, "Type mismatch");
 				}
@@ -180,8 +172,7 @@ Error OrganicClawReader::field(const char *key, T *val) noexcept {
 				err = ox::Error(1, "Type mismatch");
 			}
 		}
-	} catch (Json::LogicError const&e) {
-		oxDebugf("JSON error: {}", e.what());
+	} catch (Json::LogicError const&) {
 		err = ox::Error(1, "error reading JSON data");
 	}
 	++m_fieldIt;
@@ -190,7 +181,7 @@ Error OrganicClawReader::field(const char *key, T *val) noexcept {
 
 template<typename U, bool force>
 Error OrganicClawReader::field(const char *key, UnionView<U, force> val) noexcept {
-	ox::Error err{};
+	auto err = ox::Error(0);
 	if (targetValid()) {
 		const auto &jv = value(key);
 		if (jv.empty() || jv.isObject()) {
@@ -207,7 +198,7 @@ Error OrganicClawReader::field(const char *key, UnionView<U, force> val) noexcep
 
 template<std::size_t L>
 Error OrganicClawReader::field(const char *key, BasicString<L> *val) noexcept {
-	ox::Error err{};
+	auto err = ox::Error(0);
 	if (targetValid()) {
 		const auto &jv = value(key);
 		if (jv.empty()) {
@@ -224,7 +215,7 @@ Error OrganicClawReader::field(const char *key, BasicString<L> *val) noexcept {
 
 template<std::size_t L>
 Error OrganicClawReader::field(const char *key, IString<L> *val) noexcept {
-	ox::Error err{};
+	auto err = ox::Error(0);
 	if (targetValid()) {
 		const auto &jv = value(key);
 		if (jv.empty()) {
@@ -257,7 +248,7 @@ OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 		OX_RETURN_ERROR(handler.field("", &val[i]));
 OX_ALLOW_UNSAFE_BUFFERS_END
 	}
-	return {};
+	return ox::Error(0);
 }
 
 template<typename T>
@@ -274,7 +265,7 @@ Error OrganicClawReader::field(const char *key, HashMap<String, T> *val) noexcep
 		const auto k = keys[i].c_str();
 		OX_RETURN_ERROR(handler.field(k, &val->operator[](k)));
 	}
-	return {};
+	return ox::Error(0);
 }
 
 Error readOC(BufferView buff, auto &val) noexcept {

deps/ox/src/ox/oc/test/tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/oc/write.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -23,7 +23,7 @@ Error OrganicClawWriter::fieldCString(const char *key, const char *const*val, in
 		value(key) = *val;
 	}
 	++m_fieldIt;
-	return {};
+	return ox::Error(0);
 }
 
 Error OrganicClawWriter::fieldCString(const char *key, const char *const*val) noexcept {

deps/ox/src/ox/oc/write.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,11 +8,7 @@
 
 #pragma once
 
-#include <ox/std/def.hpp>
-
-OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 #include <json/json.h>
-OX_ALLOW_UNSAFE_BUFFERS_END
 
 #include <ox/model/fieldcounter.hpp>
 #include <ox/model/modelhandleradaptor.hpp>
@@ -46,7 +42,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return ox::Error(0);
 		}
 
 		Error field(const char *key, const int16_t *val) noexcept {
@@ -54,7 +50,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return ox::Error(0);
 		}
 
 		Error field(const char *key, const int32_t *val) noexcept {
@@ -62,7 +58,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return ox::Error(0);
 		}
 
 		Error field(const char *key, const int64_t *val) noexcept {
@@ -70,7 +66,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return ox::Error(0);
 		}
 
 
@@ -79,7 +75,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return ox::Error(0);
 		}
 
 		Error field(const char *key, const uint16_t *val) noexcept {
@@ -87,7 +83,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return ox::Error(0);
 		}
 
 		Error field(const char *key, const uint32_t *val) noexcept {
@@ -95,7 +91,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return ox::Error(0);
 		}
 
 		Error field(const char *key, const uint64_t *val) noexcept {
@@ -103,7 +99,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return ox::Error(0);
 		}
 
 		Error field(char const*key, bool const*val) noexcept {
@@ -151,7 +147,7 @@ class OrganicClawWriter {
 				value(key) = val->c_str();
 			}
 			++m_fieldIt;
-			return {};
+			return ox::Error(0);
 		}
 
 		Error fieldCString(const char*, const char *const*val, int len) noexcept;
@@ -211,7 +207,7 @@ OX_ALLOW_UNSAFE_BUFFERS_END
 		value(key) = w.m_json;
 	}
 	++m_fieldIt;
-	return {};
+	return ox::Error(0);
 }
 
 template<typename T>
@@ -237,7 +233,7 @@ Error OrganicClawWriter::field(const char *key, const T *val) noexcept {
 		}
 	}
 	++m_fieldIt;
-	return {};
+	return ox::Error(0);
 }
 
 template<typename U, bool force>
@@ -251,7 +247,7 @@ Error OrganicClawWriter::field(const char *key, UnionView<U, force> val) noexcep
 		}
 	}
 	++m_fieldIt;
-	return {};
+	return ox::Error(0);
 }
 
 Result<ox::Buffer> writeOC(const auto &val) noexcept {
@@ -262,9 +258,7 @@ Result<ox::Buffer> writeOC(const auto &val) noexcept {
 	const auto str = Json::writeString(jsonBuilder, writer.m_json);
 	Result<Buffer> buff;
 	buff.value.resize(str.size() + 1);
-	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	memcpy(buff.value.data(), str.data(), str.size() + 1);
-	OX_ALLOW_UNSAFE_BUFFERS_END
 	return buff;
 }
 
@@ -276,9 +270,7 @@ Result<ox::String> writeOCString(const auto &val) noexcept {
 	const auto str = Json::writeString(jsonBuilder, writer.m_json);
 	Result<ox::String> buff;
 	buff.value.resize(str.size());
-	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	memcpy(buff.value.data(), str.data(), str.size() + 1);
-	OX_ALLOW_UNSAFE_BUFFERS_END
 	return buff;
 }
 

deps/ox/src/ox/preloader/alignmentcatcher.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/preloader/platspecs.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/preloader/preloader.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/preloader/preloader.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/preloader/sizecatcher.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/preloader/unionsizecatcher.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/std/CMakeLists.txt

@@ -109,7 +109,6 @@ install(
 		error.hpp
 		fmt.hpp
 		hardware.hpp
-		hash.hpp
 		hashmap.hpp
 		heapmgr.hpp
 		ignore.hpp

deps/ox/src/ox/std/algorithm.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -9,25 +9,13 @@
 #pragma once
 
 #include "def.hpp"
-#include "error.hpp"
 
 OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage)
 
 namespace ox {
 
 template<typename It, typename T>
-constexpr ox::Result<size_t> findIdx(It begin, It end, T const&value) {
-	auto it = begin;
-	for (; it != end; ++it) {
-		if (*it == value) {
-			return it.offset();
-		}
-	}
-	return ox::Error{1, "item not found"};
-}
-
-template<typename It, typename T>
-constexpr It find(It begin, It end, T const&value) {
+constexpr It find(It begin, It end, const T &value) {
 	for (; begin != end; ++begin) {
 		if (*begin == value) {
 			return begin;

deps/ox/src/ox/std/anyptr.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -15,22 +15,18 @@
 
 namespace ox {
 
-namespace detail {
-
-template<bool unique>
-class AnyPtrT {
+class AnyPtr {
 	private:
 		struct WrapBase {
 			virtual constexpr ~WrapBase() = default;
 			virtual constexpr WrapBase *copyTo(ox::Span<char> s) noexcept = 0;
 			virtual constexpr operator bool() const noexcept = 0;
-			virtual void free() noexcept = 0;
 		};
 
 		template<typename T>
-		struct Wrap final: WrapBase {
+		struct Wrap: public WrapBase {
 			T *data{};
-			explicit constexpr Wrap(T *pData) noexcept: data(pData) {
+			constexpr Wrap(T *pData) noexcept: data(pData) {
 			}
 			constexpr WrapBase *copyTo(ox::Span<char> s) noexcept override {
 				oxAssert(s.size() >= sizeof(Wrap), "too small buffer");
@@ -43,60 +39,39 @@ class AnyPtrT {
 			constexpr operator bool() const noexcept override {
 				return data != nullptr;
 			}
-			constexpr void free() noexcept override {
-				safeDelete(data);
-				data = {};
-			}
 		};
 
 		WrapBase *m_wrapPtr{};
 		ox::Array<char, sizeof(Wrap<void*>)> m_wrapData;
 
 	public:
-		constexpr AnyPtrT() noexcept = default;
+		constexpr AnyPtr() noexcept = default;
 
 		template<typename T>
-		constexpr AnyPtrT(T *ptr) noexcept {
+		constexpr AnyPtr(T *ptr) noexcept {
 			if (std::is_constant_evaluated()) {
-				m_wrapPtr = new Wrap<T>(ptr);
+				m_wrapPtr = new Wrap(ptr);
 			} else {
-				m_wrapPtr = new(m_wrapData.data()) Wrap<T>(ptr);
+				m_wrapPtr = new(m_wrapData.data()) Wrap(ptr);
 			}
 		}
 
-		constexpr AnyPtrT(AnyPtrT const&other) noexcept requires(!unique) {
+		constexpr AnyPtr(AnyPtr const&other) noexcept {
 			if (other) {
 				m_wrapPtr = other.m_wrapPtr->copyTo(m_wrapData);
 			}
 		}
 
-		constexpr AnyPtrT(AnyPtrT &&other) noexcept {
-			if (other) {
-				m_wrapPtr = other.m_wrapPtr->copyTo(m_wrapData);
-				if (std::is_constant_evaluated()) {
-					ox::safeDelete(m_wrapPtr);
-				}
-				other.m_wrapPtr = {};
-			}
-		}
-
-		constexpr ~AnyPtrT() noexcept {
-			if constexpr(unique) {
-				free();
-			}
+		constexpr ~AnyPtr() noexcept {
 			if (std::is_constant_evaluated()) {
 				ox::safeDelete(m_wrapPtr);
 			}
 		}
 
 		template<typename T>
-		constexpr AnyPtrT &operator=(T *ptr) noexcept {
-			if constexpr(unique) {
-				free();
-			} else if (std::is_constant_evaluated()) {
-				ox::safeDelete(m_wrapPtr);
-			}
+		constexpr AnyPtr &operator=(T *ptr) noexcept {
 			if (std::is_constant_evaluated()) {
+				ox::safeDelete(m_wrapPtr);
 				m_wrapPtr = new Wrap(ptr);
 			} else {
 				m_wrapPtr = new(m_wrapData.data()) Wrap(ptr);
@@ -104,33 +79,11 @@ class AnyPtrT {
 			return *this;
 		}
 
-		constexpr AnyPtrT &operator=(AnyPtrT const&ptr) noexcept requires(!unique) {
+		constexpr AnyPtr &operator=(AnyPtr const&ptr) noexcept {
 			if (this != &ptr) {
-				if (std::is_constant_evaluated()) {
-					ox::safeDelete(m_wrapPtr);
-				}
 				if (ptr) {
-					m_wrapPtr = ptr.m_wrapPtr->copyTo(m_wrapData);
-				} else {
-					m_wrapPtr = nullptr;
-				}
-			}
-			return *this;
-		}
-
-		constexpr AnyPtrT &operator=(AnyPtrT &&ptr) noexcept {
-			if (this != &ptr) {
-				if constexpr(unique) {
-					free();
-				} else if (std::is_constant_evaluated()) {
 					ox::safeDelete(m_wrapPtr);
-				}
-				if (ptr) {
 					m_wrapPtr = ptr.m_wrapPtr->copyTo(m_wrapData);
-					if (std::is_constant_evaluated()) {
-						ox::safeDelete(ptr.m_wrapPtr);
-						ptr.m_wrapPtr = nullptr;
-					}
 				} else {
 					m_wrapPtr = nullptr;
 				}
@@ -142,16 +95,6 @@ class AnyPtrT {
 			return m_wrapPtr && *m_wrapPtr;
 		}
 
-		constexpr void free() noexcept {
-			if (m_wrapPtr) {
-				m_wrapPtr->free();
-			}
-			if (std::is_constant_evaluated()) {
-				ox::safeDelete(m_wrapPtr);
-			}
-			m_wrapPtr = nullptr;
-		}
-
 		template<typename T>
 		[[nodiscard]]
 		constexpr T *get() const noexcept {
@@ -161,12 +104,6 @@ class AnyPtrT {
 			return dynamic_cast<Wrap<T>*>(m_wrapPtr)->data;
 #endif
 		}
-
 };
 
-}
-
-using AnyPtr = detail::AnyPtrT<false>;
-using UAnyPtr = detail::AnyPtrT<true>;
-
 }

deps/ox/src/ox/std/array.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -181,13 +181,13 @@ constexpr Array<T, ArraySize> &Array<T, ArraySize>::operator=(Array &&other) noe
 
 template<typename T, std::size_t ArraySize>
 constexpr T &Array<T, ArraySize>::operator[](std::size_t i) noexcept {
-	boundsCheck(__FILE__, __LINE__, i, size(), "Array access overflow");
+	ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Array access overflow");
 	return m_items[i];
 }
 
 template<typename T, std::size_t ArraySize>
 constexpr const T &Array<T, ArraySize>::operator[](std::size_t i) const noexcept {
-	boundsCheck(__FILE__, __LINE__, i, size(), "Array access overflow");
+	ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Array access overflow");
 	return m_items[i];
 }
 

deps/ox/src/ox/std/assert.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,7 +7,6 @@
  */
 
 #include "fmt.hpp"
-#include "realstd.hpp"
 #include "stacktrace.hpp"
 #include "trace.hpp"
 
@@ -15,14 +14,14 @@
 
 namespace ox {
 
-void panic(StringViewCR file, int const line, StringViewCR panicMsg, Error const&err) noexcept {
+void panic(StringViewCR file, int line, StringViewCR panicMsg, const Error &err) noexcept {
 	oxErrf("\033[31;1;1mPANIC:\033[0m [{}:{}]: {}\n", file, line, panicMsg);
 	if (err.msg) {
 		oxErrf("\tError Message:\t{}\n", err.msg);
 	}
 	oxErrf("\tError Code:\t{}\n", static_cast<ErrorCode>(err));
-	if (err.src.file_name() != nullptr) {
-		oxErrf("\tError Location:\t{}:{}\n", err.src.file_name(), err.src.line());
+	if (err.file != nullptr) {
+		oxErrf("\tError Location:\t{}:{}\n", err.file, err.line);
 	}
 #ifdef OX_USE_STDLIB
 	printStackTrace(2);
@@ -33,19 +32,16 @@ void panic(StringViewCR file, int const line, StringViewCR panicMsg, Error const
 #endif
 }
 
-void panic(const char *file, int const line, char const*panicMsg, Error const&err) noexcept {
+void panic(const char *file, int line, const char *panicMsg, const Error &err) noexcept {
 	panic(StringView{file}, line, StringView{panicMsg}, err);
 }
 
-void assertFailFuncRuntime(
-	StringViewCR file,
-	int const line,
-	StringViewCR assertTxt,
-	StringViewCR msg) noexcept {
+void assertFailFuncRuntime(StringViewCR file, int line, StringViewCR assertTxt, StringViewCR msg) noexcept {
 #ifdef OX_USE_STDLIB
-	auto const st = genStackTrace(2);
-	oxTracef("assert", "Failed assert: {} ({}) [{}:{}]:\n{}", msg, assertTxt, file, line, st);
-	abort();
+	auto output = sfmt("\n\033[31;1;1mASSERT FAILURE:\033[0m [{}:{}]: {}\n", file, line, msg);
+	output += genStackTrace(2);
+	oxTracef("assert", "Failed assert: {} ({}) [{}:{}]", msg, assertTxt, file, line);
+	std::abort();
 #else
 	oxErrf("\n\033[31;1;1mASSERT FAILURE:\033[0m [{}:{}]: {}\n", file, line, msg);
 	oxTracef("assert", "Failed assert: {} ({}) [{}:{}]", msg, assertTxt, file, line);
@@ -53,25 +49,20 @@ void assertFailFuncRuntime(
 #endif
 }
 
-void assertFailFuncRuntime(
-	StringViewCR file,
-	int const line,
-	[[maybe_unused]] Error const&err,
-	StringViewCR,
-	StringViewCR assertMsg) noexcept {
+void assertFailFuncRuntime(StringViewCR file, int line, [[maybe_unused]] const Error &err, StringViewCR, StringViewCR assertMsg) noexcept {
 #if defined(OX_USE_STDLIB)
 	auto msg = sfmt("\n\033[31;1;1mASSERT FAILURE:\033[0m [{}:{}]: {}\n", file, line, assertMsg);
 	if (err.msg) {
 		msg += sfmt("\tError Message:\t{}\n", err.msg);
 	}
 	msg += sfmt("\tError Code:\t{}\n", static_cast<ErrorCode>(err));
-	if (err.src.file_name() != nullptr) {
-		msg += sfmt("\tError Location:\t{}:{}\n", err.src.file_name(), err.src.line());
+	if (err.file != nullptr) {
+		msg += sfmt("\tError Location:\t{}:{}\n", err.file, err.line);
 	}
 	msg += genStackTrace(2);
 	oxErr(msg);
 	oxTracef("assert", "Failed assert: {} [{}:{}]", assertMsg, file, line);
-	abort();
+	std::abort();
 #else
 	constexprPanic(file, line, assertMsg);
 #endif

deps/ox/src/ox/std/assert.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -22,15 +22,9 @@
 
 namespace ox {
 
-[[noreturn]]
-void panic(StringViewCR file, int line, StringViewCR panicMsg, Error const&err = {}) noexcept;
+void panic(StringViewCR file, int line, StringViewCR panicMsg, const Error &err = ox::Error(0)) noexcept;
 
-[[noreturn]]
-constexpr void constexprPanic(
-	StringViewCR file,
-	int const line,
-	StringViewCR panicMsg,
-	Error const&err = {}) noexcept {
+constexpr void constexprPanic(StringViewCR file, int line, StringViewCR panicMsg, const Error &err = ox::Error(0)) noexcept {
 	if (!std::is_constant_evaluated()) {
 		panic(file, line, panicMsg, err);
 	} else {
@@ -38,24 +32,10 @@ constexpr void constexprPanic(
 	}
 }
 
-void assertFailFuncRuntime(
-	StringViewCR file,
-	int line,
-	StringViewCR assertTxt,
-	StringViewCR msg) noexcept;
-void assertFailFuncRuntime(
-	StringViewCR file,
-	int line,
-	Error const&err,
-	StringViewCR,
-	StringViewCR assertMsg) noexcept;
+void assertFailFuncRuntime(StringViewCR file, int line, StringViewCR assertTxt, StringViewCR msg) noexcept;
+void assertFailFuncRuntime(StringViewCR file, int line, const Error &err, StringViewCR, StringViewCR assertMsg) noexcept;
 
-constexpr void assertFunc(
-	StringViewCR file,
-	int const line,
-	bool const pass,
-	[[maybe_unused]]StringViewCR assertTxt,
-	[[maybe_unused]]StringViewCR msg) noexcept {
+constexpr void assertFunc(StringViewCR file, int line, bool pass, [[maybe_unused]]StringViewCR assertTxt, [[maybe_unused]]StringViewCR msg) noexcept {
 	if (!pass) {
 		if (!std::is_constant_evaluated()) {
 			assertFailFuncRuntime(file, line, assertTxt, msg);
@@ -65,12 +45,7 @@ constexpr void assertFunc(
 	}
 }
 
-constexpr void assertFunc(
-	StringViewCR file,
-	int const line,
-	Error const&err,
-	StringViewCR,
-	StringViewCR assertMsg) noexcept {
+constexpr void assertFunc(StringViewCR file, int line, const Error &err, StringViewCR, StringViewCR assertMsg) noexcept {
 	if (err) {
 		if (!std::is_constant_evaluated()) {
 			assertFailFuncRuntime(file, line, err, {}, assertMsg);
@@ -80,11 +55,7 @@ constexpr void assertFunc(
 	}
 }
 
-constexpr void expect(
-	StringViewCR file,
-	int const line,
-	auto const&actual,
-	auto const&expected) noexcept {
+constexpr void expect(StringViewCR file, int line, const auto &actual, const auto &expected) noexcept {
 	if (actual != expected) {
 		 if (!std::is_constant_evaluated()) {
 #if defined(OX_USE_STDLIB)

deps/ox/src/ox/std/basestringview.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this