Commit aac1c36

kravantokh <kravantokh@noreply.codeberg.org>
2026-08-11 00:37:18
Rename String to Str.
main
1 parent 9b94916
Changed files (5)
datatypes
string.h
fs
file.h
platform
linux
file.h
testing
tests
020_file_basic.c
021_fileview.c
datatypes/string.h
@@ -3,7 +3,7 @@
 
 #include "platform/common/types.h"
 
-STRUCT( String,
+STRUCT( Str,
 	usize len;
 	u8 data[];
 )
@@ -22,7 +22,7 @@ STRUCT( String,
 		u8  data[sizeof(string)];                      \
 	} varname = { .len = sizeof(string)-1, .data = string }
 #else
-	#error String not implemented for current platform. 
+	#error Str not implemented for current platform. 
 
 /* For bare metal, when we get there: */
fs/file.h
@@ -63,7 +63,7 @@ static inline Status File_open_validate_flags( usize flags, Status err_source )
 	return S_SUCCESS;
 }
 
-Status File_open( const String *name, usize flags, File *out );
+Status File_open( const Str *name, usize flags, File *out );
 Status File_close( File *f );
 
 Status File_read( const File *f, usize max_amount, usize *out_amount, u8 *out );
@@ -71,7 +71,7 @@ Status File_write( const File *f, usize amount, usize *out_amount, const u8 *buf
 
 Status File_seek( const File *f, usize position );
 
-Status File_delete( const String *name );
+Status File_delete( const Str *name );
 
 
 enum FileViewFlags {
@@ -80,7 +80,7 @@ enum FileViewFlags {
 };
 
 Status FileView_from_file( File *file, usize claim_amount, usize flags, FileView *out ); /* if claim_amount == 0 => claims exact filesize */
-Status FileView_from_path( const String *path, usize claim_amount, usize flags, FileView *out ); /* This is for quick and easy mmaping of files. If you actually want control over the opening flags use FileView_from_file - if you don't  */
+Status FileView_from_path( const Str *path, usize claim_amount, usize flags, FileView *out ); /* This is for quick and easy mmaping of files. If you actually want control over the opening flags use FileView_from_file - if you don't  */
 
 Status FileView_extend_file( FileView *fv, usize amount ); /* Extend the file's end by amount */
platform/linux/file.h
@@ -22,7 +22,7 @@ STRUCT( FileView,
 	usize flags;
 )
 
-Status File_open( const String *name, usize flags, File *out ) {
+Status File_open( const Str *name, usize flags, File *out ) {
 	DEBUG( assert( name->data[name->len] == 0 ) );
 
 	if(
@@ -121,7 +121,7 @@ Status File_write( const File *f, usize amount, usize *out_amount, const u8 *buf
 	return linux_write( f->fd, amount, out_amount, buf ); 
 }
 
-Status File_delete( const String *name ) {
+Status File_delete( const Str *name ) {
 	usize res = linux_unlink( (const u8*)&name->data );
 
 	if( !LINUX_SYSCALL_ERROR(res) ) {
@@ -186,7 +186,7 @@ Status FileView_from_file( File *file, usize claim_amount, usize flags, FileView
 	return S_SUCCESS;
 }
 
-Status FileView_from_path( const String *path, usize claim_amount, usize flags, FileView *out ) {
+Status FileView_from_path( const Str *path, usize claim_amount, usize flags, FileView *out ) {
 	File file = {0};
 	TRY( File_open( path,
 		FILE_EXISTING_OPEN |
testing/tests/020_file_basic.c
@@ -60,7 +60,7 @@ void test_existing_open_missing_create(void) {
 		FILE_ACCESS_READ | FILE_ACCESS_WRITE;
 
 	/* Create */
-	Status s = File_open( (String*)&filename, flags, &f); assert( S_SUCCESSFUL(s) );
+	Status s = File_open( (Str*)&filename, flags, &f); assert( S_SUCCESSFUL(s) );
 
 	s = File_write( &f, msg.len, &written_amount, (const u8*)&msg.data ); assert( S_SUCCESSFUL(s) );
 	assert( written_amount == msg.len );
@@ -76,12 +76,12 @@ void test_existing_open_missing_create(void) {
 	s = File_close( &f ); assert( S_SUCCESSFUL(s) );
 
 	/* Open */
-	s = File_open( (String*)&filename, flags, &f); assert( S_SUCCESSFUL(s) );
+	s = File_open( (Str*)&filename, flags, &f); assert( S_SUCCESSFUL(s) );
 
 	s = File_read( &f, msg.len, &read_amount, (u8*)&buffer ); assert( S_SUCCESSFUL(s) );
 
 	s = File_close( &f ); assert( S_SUCCESSFUL(s) );
-	s = File_delete( (String*)&filename ); assert( S_SUCCESSFUL(s) );
+	s = File_delete( (Str*)&filename ); assert( S_SUCCESSFUL(s) );
 }
 
 
@@ -93,19 +93,19 @@ void test_existing_truncate_missing_create(void) {
 		FILE_ACCESS_READ | FILE_ACCESS_WRITE;
 	
 	/* Create */
-	Status s = File_open( (String*)&filename, flags, &f); assert( S_SUCCESSFUL(s) );
+	Status s = File_open( (Str*)&filename, flags, &f); assert( S_SUCCESSFUL(s) );
 	s = File_write( &f, msg.len, &written_amount, (const u8*)&msg.data ); assert( S_SUCCESSFUL(s) );
 	assert( written_amount == msg.len );
 	s = File_close( &f ); assert( S_SUCCESSFUL(s) );
 
 	/* Open (truncate) */
-	s = File_open( (String*)&filename, flags, &f); assert( S_SUCCESSFUL(s) );
+	s = File_open( (Str*)&filename, flags, &f); assert( S_SUCCESSFUL(s) );
 
 	s = File_read( &f, msg.len, &read_amount, (u8*)&buffer ); assert( S_SUCCESSFUL(s) );
 	assert( read_amount == 0 );
 
 	s = File_close( &f ); assert( S_SUCCESSFUL(s) );
-	s = File_delete( (String*)&filename ); assert( S_SUCCESSFUL(s) );
+	s = File_delete( (Str*)&filename ); assert( S_SUCCESSFUL(s) );
 }
 
 void test_existing_fail_missing_create(void) {
@@ -116,15 +116,15 @@ void test_existing_fail_missing_create(void) {
 		FILE_ACCESS_READ | FILE_ACCESS_WRITE;
 	
 	/* Create */
-	Status s = File_open( (String*)&filename, flags, &f); assert( S_SUCCESSFUL(s) );
+	Status s = File_open( (Str*)&filename, flags, &f); assert( S_SUCCESSFUL(s) );
 	s = File_write( &f, msg.len, &written_amount, (const u8*)&msg.data ); assert( S_SUCCESSFUL(s) );
 	assert( written_amount == msg.len );
 	s = File_close( &f ); assert( S_SUCCESSFUL(s) );
 
 	/* Open (fail) */
-	s = File_open( (String*)&filename, flags, &f); assert( S_FAILED(s) );
+	s = File_open( (Str*)&filename, flags, &f); assert( S_FAILED(s) );
 
-	s = File_delete( (String*)&filename ); assert( S_SUCCESSFUL(s) );
+	s = File_delete( (Str*)&filename ); assert( S_SUCCESSFUL(s) );
 }
 
 void test_existing_open_missing_fail(void) {
@@ -135,10 +135,10 @@ void test_existing_open_missing_fail(void) {
 		FILE_ACCESS_READ | FILE_ACCESS_WRITE;
 	
 	/* Create */
-	Status s = File_open( (String*)&filename, flags, &f); assert( S_FAILED(s) );
+	Status s = File_open( (Str*)&filename, flags, &f); assert( S_FAILED(s) );
 
 	/* actually create for open */
-	s = File_open( (String*)&filename,
+	s = File_open( (Str*)&filename,
 		FILE_EXISTING_FAIL |
 		FILE_MISSING_CREATE |
 		FILE_LINK_FAIL |
@@ -149,10 +149,10 @@ void test_existing_open_missing_fail(void) {
 	s = File_close( &f ); assert( S_SUCCESSFUL(s) );
 
 	/* Open */
-	s = File_open( (String*)&filename, flags, &f); assert( S_SUCCESSFUL(s) );
+	s = File_open( (Str*)&filename, flags, &f); assert( S_SUCCESSFUL(s) );
 
 	s = File_close( &f ); assert( S_SUCCESSFUL(s) );
-	s = File_delete( (String*)&filename ); assert( S_SUCCESSFUL(s) );
+	s = File_delete( (Str*)&filename ); assert( S_SUCCESSFUL(s) );
 }
 
 void test_existing_truncate_missing_fail(void) {
@@ -163,10 +163,10 @@ void test_existing_truncate_missing_fail(void) {
 		FILE_ACCESS_READ | FILE_ACCESS_WRITE;
 	
 	/* Create */
-	Status s = File_open( (String*)&filename, flags, &f); assert( S_FAILED(s) );
+	Status s = File_open( (Str*)&filename, flags, &f); assert( S_FAILED(s) );
 
 	/* actually create for open */
-	s = File_open( (String*)&filename,
+	s = File_open( (Str*)&filename,
 		FILE_EXISTING_FAIL |
 		FILE_MISSING_CREATE |
 		FILE_LINK_FAIL |
@@ -178,27 +178,27 @@ void test_existing_truncate_missing_fail(void) {
 	s = File_close( &f ); assert( S_SUCCESSFUL(s) );
 
 	/* Open (truncate) */
-	s = File_open( (String*)&filename, flags, &f); assert( S_SUCCESSFUL(s) );
+	s = File_open( (Str*)&filename, flags, &f); assert( S_SUCCESSFUL(s) );
 
 	s = File_read( &f, msg.len, &read_amount, (u8*)&buffer ); assert( S_SUCCESSFUL(s) );
 	assert( read_amount == 0 );
 
 	s = File_close( &f ); assert( S_SUCCESSFUL(s) );
-	s = File_delete( (String*)&filename ); assert( S_SUCCESSFUL(s) );
+	s = File_delete( (Str*)&filename ); assert( S_SUCCESSFUL(s) );
 }
 
 void test_file_access(void) {
 	usize flags = FILE_EXISTING_OPEN | FILE_MISSING_CREATE | FILE_LINK_FAIL;
 
-	Status s = File_open( (String*)&filename, flags | FILE_ACCESS_READ, &f); assert( S_SUCCESSFUL(s) );
+	Status s = File_open( (Str*)&filename, flags | FILE_ACCESS_READ, &f); assert( S_SUCCESSFUL(s) );
 	s = File_write( &f, msg.len, &written_amount, (const u8*)&msg.data ); assert( S_FAILED(s) );
 	s = File_close( &f ); assert( S_SUCCESSFUL(s) );
 	
-	s = File_open( (String*)&filename, flags | FILE_ACCESS_WRITE, &f); assert( S_SUCCESSFUL(s) );
+	s = File_open( (Str*)&filename, flags | FILE_ACCESS_WRITE, &f); assert( S_SUCCESSFUL(s) );
 	s = File_read( &f, msg.len, &read_amount, (u8*)&buffer ); assert( S_FAILED(s) );
 	s = File_close( &f ); assert( S_SUCCESSFUL(s) );
 
-	s = File_open( (String*)&filename, flags | FILE_ACCESS_APPEND, &f); assert( S_SUCCESSFUL(s) );
+	s = File_open( (Str*)&filename, flags | FILE_ACCESS_APPEND, &f); assert( S_SUCCESSFUL(s) );
 	s = File_read( &f, msg.len, &read_amount, (u8*)&buffer ); assert( S_FAILED(s) );
 	s = File_close( &f ); assert( S_SUCCESSFUL(s) );
 }
@@ -210,19 +210,19 @@ void test_existing_fail_missing_fail(void) {
 		FILE_LINK_FAIL |
 		FILE_ACCESS_READ | FILE_ACCESS_WRITE;
 
-	Status s = File_open( (String*)&filename, flags, &f); assert( S_FAILED(s) );
+	Status s = File_open( (Str*)&filename, flags, &f); assert( S_FAILED(s) );
 }
 
 void test_invalid_combinations(void) {
 
 	usize flags = FILE_EXISTING_OPEN | FILE_MISSING_CREATE | FILE_LINK_FAIL | FILE_ACCESS_READ;
 
-	Status s = File_open( (String*)&filename, flags | FILE_ACCESS_APPEND | FILE_ACCESS_WRITE, &f); assert( S_FAILED(s) );
-	s = File_open( (String*)&filename, flags | FILE_EXISTING_FAIL, &f); assert( S_FAILED(s) );
-	s = File_open( (String*)&filename, flags | FILE_EXISTING_TRUNCATE, &f); assert( S_FAILED(s) );
-	s = File_open( (String*)&filename, flags | FILE_EXISTING_TRUNCATE | FILE_EXISTING_FAIL, &f); assert( S_FAILED(s) );
+	Status s = File_open( (Str*)&filename, flags | FILE_ACCESS_APPEND | FILE_ACCESS_WRITE, &f); assert( S_FAILED(s) );
+	s = File_open( (Str*)&filename, flags | FILE_EXISTING_FAIL, &f); assert( S_FAILED(s) );
+	s = File_open( (Str*)&filename, flags | FILE_EXISTING_TRUNCATE, &f); assert( S_FAILED(s) );
+	s = File_open( (Str*)&filename, flags | FILE_EXISTING_TRUNCATE | FILE_EXISTING_FAIL, &f); assert( S_FAILED(s) );
 
-	s = File_open( (String*)&filename, flags | FILE_MISSING_FAIL, &f); assert( S_FAILED(s) );
-	s = File_open( (String*)&filename, flags | FILE_LINK_FOLLOW, &f); assert( S_FAILED(s) );
+	s = File_open( (Str*)&filename, flags | FILE_MISSING_FAIL, &f); assert( S_FAILED(s) );
+	s = File_open( (Str*)&filename, flags | FILE_LINK_FOLLOW, &f); assert( S_FAILED(s) );
 }
testing/tests/021_fileview.c
@@ -7,7 +7,7 @@ void entry(void) {
 
 	Status s;
 
-	s = FileView_from_path( (String*)&filename, MiB(1), FILEVIEW_OWN_FILE, &fv );
+	s = FileView_from_path( (Str*)&filename, MiB(1), FILEVIEW_OWN_FILE, &fv );
 	assert( S_SUCCESSFUL(s) );
 
 	s = FileView_extend_file( &fv, 5 );
@@ -24,7 +24,7 @@ void entry(void) {
 
 	mem_set( &fv, sizeof(fv), 0 );
 
-	s = FileView_from_path( (String*)&filename, MiB(1), FILEVIEW_OWN_FILE, &fv );
+	s = FileView_from_path( (Str*)&filename, MiB(1), FILEVIEW_OWN_FILE, &fv );
 	assert( S_SUCCESSFUL(s) );
 
 	assert( fv.start->data[0] == 'h');