Timerix/tlibc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added macros for printf format codes

Browse Source
This commit is contained in:
Timerix 2025-11-15 12:12:06 +05:00
parent 5ef223372b
commit ae0fa95d6a
5 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
include/tlibc/std.h
View File

@ -7,21 +7,23 @@ extern "C" {
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>
#include <inttypes.h>
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#include <errno.h> #include <errno.h>
typedef int8_t i8; typedef int8_t i8;
typedef uint8_t u8; typedef int16_t i16;
typedef int16_t i16; typedef int32_t i32;
typedef uint16_t u16; typedef int64_t i64;
typedef int32_t i32; typedef uint8_t u8;
typedef uint32_t u32; typedef uint16_t u16;
typedef int64_t i64; typedef uint32_t u32;
typedef uint64_t u64; typedef uint64_t u64;
typedef float f32; typedef float f32;
typedef double f64; typedef double f64;
typedef const char* cstr;
#if !__cplusplus && !defined(bool) #if !__cplusplus && !defined(bool)
typedef u8 bool; typedef u8 bool;
@ -29,7 +31,29 @@ typedef u8 bool;
#define false 0 #define false 0
#endif #endif
typedef const char* cstr;
#define FMT_i8 "%"PRIi8
#define FMT_i16 "%"PRIi16
#define FMT_i32 "%"PRIi32
#define FMT_i64 "%"PRIi64
#define FMT_u8 "%"PRIu8
#define FMT_u16 "%"PRIu16
#define FMT_u32 "%"PRIu32
#define FMT_u64 "%"PRIu64
#define FMT_x8 "%"PRIx8
#define FMT_x16 "%"PRIx16
#define FMT_x32 "%"PRIx32
#define FMT_x64 "%"PRIx64
#define FMT_X8 "%"PRIX8
#define FMT_X16 "%"PRIX16
#define FMT_X32 "%"PRIX32
#define FMT_X64 "%"PRIX64
#define FMT_o8 "%"PRIo8
#define FMT_o16 "%"PRIo16
#define FMT_o32 "%"PRIo32
#define FMT_o64 "%"PRIo64
#define FMT_f32 "%f"
#define FMT_f64 "%lf"
#define dbg(N) printf("\e[95m%d\n",N) #define dbg(N) printf("\e[95m%d\n",N)

1
include/tlibc/string/StringBuilder.h
View File

@ -30,6 +30,7 @@ void StringBuilder_append_cstr(StringBuilder* b, cstr s);
void StringBuilder_append_str(StringBuilder* b, str s); void StringBuilder_append_str(StringBuilder* b, str s);
void StringBuilder_append_i64(StringBuilder* b, i64 a); void StringBuilder_append_i64(StringBuilder* b, i64 a);
void StringBuilder_append_u64(StringBuilder* b, u64 a); void StringBuilder_append_u64(StringBuilder* b, u64 a);
void StringBuilder_append_f32(StringBuilder* b, f32 n);
void StringBuilder_append_f64(StringBuilder* b, f64 a); void StringBuilder_append_f64(StringBuilder* b, f64 a);
void StringBuilder_append_memory(StringBuilder* b, Array(u8) mem, bool uppercase); void StringBuilder_append_memory(StringBuilder* b, Array(u8) mem, bool uppercase);

2
include/tlibc/string/str.h
View File

@ -11,6 +11,8 @@ typedef struct str {
bool isZeroTerminated; bool isZeroTerminated;
} str; } str;
#define FMT_str "%.*s"
/// creates str from a string literal /// creates str from a string literal
#define STR(LITERAL) str_construct(LITERAL, ARRAY_LEN(LITERAL) - 1, true) #define STR(LITERAL) str_construct(LITERAL, ARRAY_LEN(LITERAL) - 1, true)

4
src/filesystem/file.c
View File

@ -58,7 +58,7 @@ Result(i64) file_tellPos(FILE* f){
Result(void) file_seek(FILE* f, i64 offset, SeekOrigin origin){ Result(void) file_seek(FILE* f, i64 offset, SeekOrigin origin){
if(IFWIN(_fseeki64, fseeko64)(f, offset, (int)origin) != 0){ if(IFWIN(_fseeki64, fseeko64)(f, offset, (int)origin) != 0){
return RESULT_ERROR_FMT( return RESULT_ERROR_FMT(
"Can't seek (offset: " IFWIN("%lli", "%li") ", origin: %i) in file: %s", "Can't seek (offset: "FMT_i64", origin: %i) in file: %s",
offset, origin, strerror(errno)); offset, origin, strerror(errno));
} }
return RESULT_VOID; return RESULT_VOID;
@ -119,7 +119,7 @@ Result(void) file_readStructsExactly(FILE* f, void* dst, u64 struct_size, u64 ex
} }
if(r != exact_count){ if(r != exact_count){
return RESULT_ERROR_FMT( return RESULT_ERROR_FMT(
"read " IFWIN("%llu", "%lu") " structures out of " IFWIN("%llu", "%lu"), "read "FMT_u64" structures out of "FMT_u64,
r, exact_count); r, exact_count);
} }
return RESULT_VOID; return RESULT_VOID;

12
src/string/StringBuilder.c
View File

@ -51,19 +51,25 @@ void StringBuilder_append_cstr(StringBuilder* b, cstr s){
void StringBuilder_append_i64(StringBuilder* b, i64 n){ void StringBuilder_append_i64(StringBuilder* b, i64 n){
char buf[32]; char buf[32];
sprintf(buf, IFWIN("%lli", "%li"), n); sprintf(buf, FMT_i64, n);
StringBuilder_append_cstr(b, buf); StringBuilder_append_cstr(b, buf);
} }
void StringBuilder_append_u64(StringBuilder* b, u64 n){ void StringBuilder_append_u64(StringBuilder* b, u64 n){
char buf[32]; char buf[32];
sprintf(buf, IFWIN("%llu", "%lu"), n); sprintf(buf, FMT_u64, n);
StringBuilder_append_cstr(b, buf);
}
void StringBuilder_append_f32(StringBuilder* b, f32 n){
char buf[32];
sprintf(buf, FMT_f32, n);
StringBuilder_append_cstr(b, buf); StringBuilder_append_cstr(b, buf);
} }
void StringBuilder_append_f64(StringBuilder* b, f64 n){ void StringBuilder_append_f64(StringBuilder* b, f64 n){
char buf[32]; char buf[32];
sprintf(buf, "%lf", n); sprintf(buf, FMT_f64, n);
StringBuilder_append_cstr(b, buf); StringBuilder_append_cstr(b, buf);
} }