diff --git a/detect_arch.sh b/detect_arch.sh index 08d3e0c..07cf405 100755 --- a/detect_arch.sh +++ b/detect_arch.sh @@ -1,7 +1,7 @@ #!/bin/bash -uname_rezult="$(uname -m)" +uname_result="$(uname -m)" -case "$uname_rezult" in +case "$uname_result" in arm | arm32 | armhf | aarch32) ARCH=arm32 ;; @@ -15,7 +15,7 @@ case "$uname_rezult" in ARCH=x64 ;; *) - echo "unknown CPU architecture: $uname_rezult" + echo "unknown CPU architecture: $uname_result" exit 1 ;; esac diff --git a/detect_os.sh b/detect_os.sh index 541dd96..c158b9d 100755 --- a/detect_os.sh +++ b/detect_os.sh @@ -1,7 +1,7 @@ #!/bin/bash -uname_rezult="$(uname -o)" +uname_result="$(uname -o)" -case "$uname_rezult" in +case "$uname_result" in Msys | Cygwin | "MS/Windows") OS=windows ;; @@ -18,7 +18,7 @@ case "$uname_rezult" in OS=macos ;; *) - echo "unknown operating system: $uname_rezult" + echo "unknown operating system: $uname_result" exit 1 ;; esac diff --git a/kerep/src/Filesystem/file.c b/kerep/src/Filesystem/file.c index 5c38523..a1bf50c 100644 --- a/kerep/src/Filesystem/file.c +++ b/kerep/src/Filesystem/file.c @@ -64,64 +64,64 @@ Maybe file_close(FileHandle file){ } #define ioWriteCheck() \ - if(rezult==EOF) \ + if(result==EOF) \ safethrow(ERR_IO_EOF,;); \ - if(rezult!=0) \ + if(result!=0) \ safethrow(ERR_IO,;); Maybe file_writeChar(FileHandle file, char byte){ - i32 rezult=fputc(byte, file); + i32 result=fputc(byte, file); ioWriteCheck(); return MaybeNull; } Maybe file_writeBuffer(FileHandle file, char* buffer, u64 length){ - i32 rezult=0; - for(u64 i=0; i0) StringBuilder_append_string(sb, (string){.ptr=(char*)src, .length=src_remains_len}); - string rezult=StringBuilder_build(sb); - return rezult.ptr; + string result=StringBuilder_build(sb); + return result.ptr; } diff --git a/kerep/src/base/errors.c b/kerep/src/base/errors.c index 6f093f1..81a3e7f 100644 --- a/kerep/src/base/errors.c +++ b/kerep/src/base/errors.c @@ -25,23 +25,23 @@ char* errname(ErrorId err){ char* __genErrMsg(const char* errmsg, const char* srcfile, i32 line, const char* funcname){ size_t bufsize=ERRMSG_MAXLENGTH; - char* rezult=malloc(bufsize); + char* result=malloc(bufsize); IFMSC( - sprintf_s(rezult,bufsize,"[%s:%d] %s() throwed error: %s",srcfile,line,funcname,errmsg), - sprintf(rezult,"[%s:%d] %s() throwed error: %s",srcfile,line,funcname,errmsg) + sprintf_s(result,bufsize,"[%s:%d] %s() throwed error: %s",srcfile,line,funcname,errmsg), + sprintf(result,"[%s:%d] %s() throwed error: %s",srcfile,line,funcname,errmsg) ); - return rezult; + return result; } char* __extendErrMsg(const char* errmsg, const char* srcfile, i32 line, const char* funcname){ size_t bufsize=cptr_length(errmsg)+ERRMSG_MAXLENGTH; - char* rezult=malloc(bufsize); + char* result=malloc(bufsize); IFMSC( - sprintf_s(rezult,bufsize,"%s\n \\___[%s:%d] %s()",errmsg,srcfile,line,funcname), - sprintf(rezult,"%s\n \\___[%s:%d] %s()",errmsg,srcfile,line,funcname) + sprintf_s(result,bufsize,"%s\n \\___[%s:%d] %s()",errmsg,srcfile,line,funcname), + sprintf(result,"%s\n \\___[%s:%d] %s()",errmsg,srcfile,line,funcname) ); free(errmsg); - return rezult; + return result; } void Maybe_free(Maybe e){ diff --git a/kerep/src/base/errors.h b/kerep/src/base/errors.h index a0e228a..635143e 100644 --- a/kerep/src/base/errors.h +++ b/kerep/src/base/errors.h @@ -60,10 +60,10 @@ char* __unknownErr( ); __RETURN_EXCEPTION(((char*)__genErrMsg(E, __FILE__,__LINE__,__func__))); \ } -#define try_cpp(_funcCall, _rezult, freeMem) Maybe _rezult=_funcCall; if(_rezult.errmsg){ \ +#define try_cpp(_funcCall, _result, freeMem) Maybe _result=_funcCall; if(_result.errmsg){ \ freeMem; \ - _rezult.errmsg=__extendErrMsg(_rezult.errmsg, __FILE__,__LINE__,__func__); \ - return _rezult; \ + _result.errmsg=__extendErrMsg(_result.errmsg, __FILE__,__LINE__,__func__); \ + return _result; \ } #else @@ -73,16 +73,16 @@ char* __unknownErr( ); __RETURN_EXCEPTION(((char*)__genErrMsg((__stringify_err(E)), __FILE__,__LINE__,__func__))); \ } -#define try(_funcCall, _rezult, freeMem) Maybe _rezult=_funcCall; if(_rezult.errmsg){ \ +#define try(_funcCall, _result, freeMem) Maybe _result=_funcCall; if(_result.errmsg){ \ freeMem; \ - _rezult.errmsg=__extendErrMsg(_rezult.errmsg, __FILE__,__LINE__,__func__); \ - return _rezult; \ + _result.errmsg=__extendErrMsg(_result.errmsg, __FILE__,__LINE__,__func__); \ + return _result; \ } #endif -#define tryLast(_funcCall, _rezult, ON_EXIT) Maybe _rezult=_funcCall; if(_rezult.errmsg){ \ - _rezult.errmsg=__extendErrMsg(_rezult.errmsg, __FILE__,__LINE__,__func__); \ - __EXIT(_rezult.errmsg); \ +#define tryLast(_funcCall, _result, ON_EXIT) Maybe _result=_funcCall; if(_result.errmsg){ \ + _result.errmsg=__extendErrMsg(_result.errmsg, __FILE__,__LINE__,__func__); \ + __EXIT(_result.errmsg); \ } #if __cplusplus diff --git a/kerep/src/base/std.h b/kerep/src/base/std.h index 225f57b..1718298 100644 --- a/kerep/src/base/std.h +++ b/kerep/src/base/std.h @@ -132,7 +132,7 @@ You can even embed it into macro in header (see kprint.h) PRAGMA_WARNING_POP /// gcc throws warning on unused function return value -#define WARN_UNUSED_REZULT __attribute__((warn_unused_result)) +#define WARN_UNUSED_RESULT __attribute__((WARN_UNUSED_RESULT)) #if __cplusplus } diff --git a/kerep/src/base/type_system/unitype.c b/kerep/src/base/type_system/unitype.c index a85c05e..eb53fdf 100644 --- a/kerep/src/base/type_system/unitype.c +++ b/kerep/src/base/type_system/unitype.c @@ -85,11 +85,11 @@ char *Unitype_toString(Unitype u, u32 fmt) valuestr = type->toString(u.VoidPtr, fmt); else valuestr = "ERR_NO_TOSTRING_FUNC"; - char *rezult = cptr_concat("{ type: ", type->name, ", allocated on heap: ", (u.allocatedInHeap ? "true" : "false"), + char *result = cptr_concat("{ type: ", type->name, ", allocated on heap: ", (u.allocatedInHeap ? "true" : "false"), ", value:", valuestr, " }"); if (type->toString) free(valuestr); - return rezult; + return result; } void printuni(Unitype v) diff --git a/kerep/src/kprint/kprint.c b/kerep/src/kprint/kprint.c index 046cf29..5105ca9 100644 --- a/kerep/src/kprint/kprint.c +++ b/kerep/src/kprint/kprint.c @@ -53,8 +53,8 @@ Maybe __ksprint(u8 n, kp_fmt* formats, __kp_value_union* objects){ StringBuilder_append_cptr(strb, mStr.value.VoidPtr); Unitype_free(mStr.value); } - char* rezult=StringBuilder_build(strb).ptr; - return SUCCESS(UniHeapPtr(char, rezult)); + char* result=StringBuilder_build(strb).ptr; + return SUCCESS(UniHeapPtr(char, result)); } Maybe __kfprint(FILE* file, u8 n, kp_fmt* formats, __kp_value_union* objects){ diff --git a/src/process/Process_windows.c b/src/process/Process_windows.c index 87b4412..099372e 100644 --- a/src/process/Process_windows.c +++ b/src/process/Process_windows.c @@ -10,9 +10,9 @@ Maybe Process_start(Process* p, const char* file_path, const char** args, int ar memset(p, 0, sizeof(Process)); if(search_in_PATH && !cptr_contains(file_path, "\\")){ LPSTR lpFilePart; - char search_rezult[MAX_PATH]; - safethrow_if_false(SearchPath( NULL, file_path, NULL, MAX_PATH, search_rezult, &lpFilePart)) - file_path = cptr_copy(search_rezult); + char search_result[MAX_PATH]; + safethrow_if_false(SearchPath( NULL, file_path, NULL, MAX_PATH, search_result, &lpFilePart)) + file_path = cptr_copy(search_result); } SECURITY_ATTRIBUTES saAttr;