[STRING] renamed functions to be more readable

Author: Diego Ferrari

kernel/bin/cat.c

@@ -11,7 +11,7 @@ int run_cat(int argc, char* argv[]){
     file fd2;
     open_file(s.data, &fd2);
     if (argc != 2){
-        string err_msg = string_l("Usage cat <path> <size>");
+        string err_msg = string_from_literal("Usage cat <path> <size>");
         write_file(&fd2, err_msg.data, err_msg.length);
         free(err_msg.data, err_msg.mem_length);
         return 2;

kernel/console/kconsole/terminal.cpp

@@ -74,11 +74,11 @@ void Terminal::run_command(){
     string args_copy = {};
 
     if (fullcmd == args){
-        cmd = string_l(fullcmd);
+        cmd = string_from_literal(fullcmd);
         argv = 0;
     } else {
-        cmd = string_ca_max(fullcmd, args - fullcmd - 1);
-        args_copy = string_l(args);
+        cmd = string_from_literal_length(fullcmd, args - fullcmd - 1);
+        args_copy = string_from_literal(args);
         argv = parse_arguments(args_copy.data, &argc);
     }
 

kernel/kernel_processes/monitor/monitor_processes.c

@@ -106,8 +106,8 @@ void draw_process_view(){
 
         if (proc == NULL || proc->id == 0 || valid_count < i || proc->state == STOPPED) break;
 
-        string name = string_l((const char*)(uintptr_t)proc->name);
-        string state = string_l(parse_proc_state(proc->state));
+        string name = string_from_literal((const char*)(uintptr_t)proc->name);
+        string state = string_from_literal(parse_proc_state(proc->state));
 
         int scale = 2;
 

kernel/kernel_processes/windows/desktop.cpp

@@ -36,8 +36,8 @@ Desktop::Desktop() {
         for (uint32_t i = 0; i < list->count; i++){
             char *file = reader;
             string fullpath = string_format("/boot/redos/user/%s",(uintptr_t)file);
-            string name = string_ca_max(file,find_extension(file));
-            string ext = string_l(file + find_extension(file));
+            string name = string_from_literal_length(file,find_extension(file));
+            string ext = string_from_literal(file + find_extension(file));
             if (strcmp(ext.data,".elf", true) == 0){
                 add_entry(name.data, ext.data, fullpath.data);
             }

shared/net/application_layer/http.c

@@ -144,20 +144,20 @@ void http_header_parser(const char *buf, uint32_t len,
             C->length = parse_u32(buf + val_start, val_len);
         }
         else if (copy_len == 12 && strcmp(key_tmp, "content-type", true) == 0) {
-            C->type = string_ca_max((char*)(buf + val_start), val_len);
+            C->type = string_from_literal_length((char*)(buf + val_start), val_len);
         }
         else if (copy_len == 4 && strcmp(key_tmp, "date", true) == 0) {
-            C->date = string_ca_max((char*)(buf + val_start), val_len);
+            C->date = string_from_literal_length((char*)(buf + val_start), val_len);
         }
         else if (copy_len == 10 && strcmp(key_tmp, "connection", true) == 0) {
-            C->connection = string_ca_max((char*)(buf + val_start), val_len);
+            C->connection = string_from_literal_length((char*)(buf + val_start), val_len);
         }
         else if (copy_len == 10 && strcmp(key_tmp, "keep-alive", true) == 0) {
-            C->keep_alive = string_ca_max((char*)(buf + val_start), val_len);
+            C->keep_alive = string_from_literal_length((char*)(buf + val_start), val_len);
         }
         else {
-            string key = string_ca_max((char*)(buf + pos), key_len);
-            string value = string_ca_max((char*)(buf + val_start), val_len);
+            string key = string_from_literal_length((char*)(buf + pos), key_len);
+            string value = string_from_literal_length((char*)(buf + val_start), val_len);
             extras[extra_i++] = (HTTPHeader){ key, value };
         }
 
@@ -184,7 +184,7 @@ string http_request_builder(const HTTPRequestMsg *R)
     free(hdrs.data, hdrs.mem_length);
 
     if (R->body.ptr && R->body.size) {
-        string body = string_ca_max((char*)R->body.ptr, R->body.size);
+        string body = string_from_literal_length((char*)R->body.ptr, R->body.size);
         string_append_bytes(&out, body.data, body.length);
         free(body.data, body.mem_length);
     }
@@ -247,7 +247,7 @@ string http_get_chunked_payload(sizedptr chunk) {
     if (chunk.ptr && chunk.size > 0) {
         int sizetrm = strindex((char*)chunk.ptr, "\r\n");
         uint64_t chunk_size = parse_hex_u64((char*)chunk.ptr, sizetrm);
-        return string_ca_max((char*)(chunk.ptr + sizetrm + 2),
+        return string_from_literal_length((char*)(chunk.ptr + sizetrm + 2),
                             (uint32_t)chunk_size);
     }
     return (string){0};

shared/std/string.c

@@ -11,7 +11,7 @@ uint32_t strlen(const char *s, uint32_t max_length){
     return len;
 }
 
-string string_l(const char *literal){
+string string_from_literal(const char *literal){
     if (literal == NULL) return (string){ .data = NULL, .length = 0, .mem_length = 0};
 
     uint32_t len = strlen(literal, 0);
@@ -49,7 +49,7 @@ string string_tail(const char *array, uint32_t max_length){
     return (string){.data = buf, .length = adjusted_len, .mem_length = adjusted_len + 1 };
 }
 
-string string_ca_max(const char *array, uint32_t max_length){
+string string_from_literal_length(const char *array, uint32_t max_length){
     if (array == NULL) return (string){.data = NULL, .length = 0, .mem_length= 0 };
 
     uint32_t len = strlen(array, max_length);
@@ -62,7 +62,7 @@ string string_ca_max(const char *array, uint32_t max_length){
     return (string){ .data = buf, .length = len, .mem_length = len+1};
 }
 
-string string_c(const char c){
+string string_from_char(const char c){
     char *buf = (char*)malloc(2);
     buf[0] = c;
     buf[1] = 0;
@@ -238,7 +238,7 @@ char tolower(char c){
 }
 
 int strcmp(const char *a, const char *b, bool case_insensitive){
-    if (a == NULL && b == NULL)return 0; //i guess
+    if (a == NULL && b == NULL) return 0;
     if (a == NULL) return -1;  
     if (b == NULL) return  1;
 
@@ -378,7 +378,7 @@ string string_concat(string a, string b)
     return (string){ dst, len, len };
 }
 
-void string_concat_inplace(string *dest, string src) //b string_concat_inplace
+void string_concat_inplace(string *dest, string src)
 {
     if (!dest || !src.data) return;
 

shared/std/string.h

@@ -21,9 +21,9 @@ typedef struct string_list {
 } string_list;
 
 uint32_t strlen(const char *s, uint32_t max_length);
-string string_l(const char *literal);
-string string_ca_max(const char *array, uint32_t max_length);
-string string_c(const char c);
+string string_from_literal(const char *literal);
+string string_from_literal_length(const char *array, uint32_t max_length);
+string string_from_char(const char c);
 string string_from_hex(uint64_t value);
 bool string_equals(string a, string b);
 string string_replace(const char *str, char orig, char repl);
@@ -45,7 +45,7 @@ int count_occurrences(const char* str, char c);
 uint64_t parse_hex_u64(const char* str, size_t size);
 uint64_t parse_int_u64(const char* str, size_t size);
 
-bool utf16tochar( uint16_t* str_in, char* out_str, size_t max_len);
+bool utf16tochar(uint16_t* str_in, char* out_str, size_t max_len);
 
 string string_from_const(const char *literal);
 string string_concat(string a, string b);

user/default_process.c

@@ -10,14 +10,14 @@ void proc_func() {
     gpu_rect rect = (gpu_rect){{10,10},{size.width-20,size.height-20}};
     while (1) {
         keypress kp;
-        printf("Print console test %f", (get_time()/1000.f));
+        // printf("Print console test %f", (get_time()/1000.f));
         while (read_key(&kp)){
             if (kp.keys[0] == KEY_ESC)
                 halt(0);
         }
         fb_clear(&ctx, 0xFFFFFFFF);
         fb_fill_rect(&ctx, rect.point.x, rect.point.y, rect.size.width, rect.size.height, 0xFF222233);
-        string s = string_l("Print screen test");
+        string s = string_from_literal("Print screen test");
         fb_draw_string(&ctx, s.data, rect.point.x, rect.point.y, 2, 0xFFFFFFFF);
         free(s.data,s.mem_length);
         gpu_flush_data(&ctx);