typo fix
This commit is contained in:
parent
4002a222f5
commit
ad276eae12
@ -1,7 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
uname_rezult="$(uname -m)"
|
uname_result="$(uname -m)"
|
||||||
|
|
||||||
case "$uname_rezult" in
|
case "$uname_result" in
|
||||||
arm | arm32 | armhf | aarch32)
|
arm | arm32 | armhf | aarch32)
|
||||||
ARCH=arm32
|
ARCH=arm32
|
||||||
;;
|
;;
|
||||||
@ -15,7 +15,7 @@ case "$uname_rezult" in
|
|||||||
ARCH=x64
|
ARCH=x64
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "unknown CPU architecture: $uname_rezult"
|
echo "unknown CPU architecture: $uname_result"
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
uname_rezult="$(uname -o)"
|
uname_result="$(uname -o)"
|
||||||
|
|
||||||
case "$uname_rezult" in
|
case "$uname_result" in
|
||||||
Msys | Cygwin | "MS/Windows")
|
Msys | Cygwin | "MS/Windows")
|
||||||
OS=windows
|
OS=windows
|
||||||
;;
|
;;
|
||||||
@ -18,7 +18,7 @@ case "$uname_rezult" in
|
|||||||
OS=macos
|
OS=macos
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "unknown operating system: $uname_rezult"
|
echo "unknown operating system: $uname_result"
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
@ -64,64 +64,64 @@ Maybe file_close(FileHandle file){
|
|||||||
}
|
}
|
||||||
|
|
||||||
#define ioWriteCheck() \
|
#define ioWriteCheck() \
|
||||||
if(rezult==EOF) \
|
if(result==EOF) \
|
||||||
safethrow(ERR_IO_EOF,;); \
|
safethrow(ERR_IO_EOF,;); \
|
||||||
if(rezult!=0) \
|
if(result!=0) \
|
||||||
safethrow(ERR_IO,;);
|
safethrow(ERR_IO,;);
|
||||||
|
|
||||||
Maybe file_writeChar(FileHandle file, char byte){
|
Maybe file_writeChar(FileHandle file, char byte){
|
||||||
i32 rezult=fputc(byte, file);
|
i32 result=fputc(byte, file);
|
||||||
ioWriteCheck();
|
ioWriteCheck();
|
||||||
return MaybeNull;
|
return MaybeNull;
|
||||||
}
|
}
|
||||||
|
|
||||||
Maybe file_writeBuffer(FileHandle file, char* buffer, u64 length){
|
Maybe file_writeBuffer(FileHandle file, char* buffer, u64 length){
|
||||||
i32 rezult=0;
|
i32 result=0;
|
||||||
for(u64 i=0; i<length && !rezult; i++)
|
for(u64 i=0; i<length && !result; i++)
|
||||||
rezult=fputc(buffer[i], file);
|
result=fputc(buffer[i], file);
|
||||||
ioWriteCheck();
|
ioWriteCheck();
|
||||||
return MaybeNull;
|
return MaybeNull;
|
||||||
}
|
}
|
||||||
|
|
||||||
Maybe file_writeCptr(FileHandle file, char* cptr){
|
Maybe file_writeCptr(FileHandle file, char* cptr){
|
||||||
i32 rezult=fputs(cptr, file);
|
i32 result=fputs(cptr, file);
|
||||||
ioWriteCheck();
|
ioWriteCheck();
|
||||||
return MaybeNull;
|
return MaybeNull;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Maybe file_readChar(FileHandle file){
|
Maybe file_readChar(FileHandle file){
|
||||||
i32 rezult=fgetc(file);
|
i32 result=fgetc(file);
|
||||||
if(feof(file)) safethrow(ERR_IO_EOF,;);
|
if(feof(file)) safethrow(ERR_IO_EOF,;);
|
||||||
if(ferror(file)) safethrow(ERR_IO,;);
|
if(ferror(file)) safethrow(ERR_IO,;);
|
||||||
return SUCCESS(UniUInt64(rezult));
|
return SUCCESS(UniUInt64(result));
|
||||||
}
|
}
|
||||||
|
|
||||||
Maybe file_readBuffer(FileHandle file, char* buffer, u64 length){
|
Maybe file_readBuffer(FileHandle file, char* buffer, u64 length){
|
||||||
i32 rezult=0;
|
i32 result=0;
|
||||||
u64 i=0;
|
u64 i=0;
|
||||||
for(; i<length && rezult!=EOF; i++){
|
for(; i<length && result!=EOF; i++){
|
||||||
rezult=fgetc(file);
|
result=fgetc(file);
|
||||||
buffer[i]=(char)rezult;
|
buffer[i]=(char)result;
|
||||||
}
|
}
|
||||||
if(ferror(file)) safethrow(ERR_IO,;);
|
if(ferror(file)) safethrow(ERR_IO,;);
|
||||||
return SUCCESS(UniUInt64(i));
|
return SUCCESS(UniUInt64(i));
|
||||||
}
|
}
|
||||||
|
|
||||||
Maybe file_readAll(FileHandle file, char** allBytes){
|
Maybe file_readAll(FileHandle file, char** allBytes){
|
||||||
i32 rezult=0;
|
i32 result=0;
|
||||||
char buffer[256];
|
char buffer[256];
|
||||||
string bufStr={.ptr=buffer, .length=sizeof(buffer)};
|
string bufStr={.ptr=buffer, .length=sizeof(buffer)};
|
||||||
StringBuilder* sb=StringBuilder_create();
|
StringBuilder* sb=StringBuilder_create();
|
||||||
u64 i=0;
|
u64 i=0;
|
||||||
while(true){
|
while(true){
|
||||||
rezult=fgetc(file);
|
result=fgetc(file);
|
||||||
if(rezult==EOF){
|
if(result==EOF){
|
||||||
if(ferror(file))
|
if(ferror(file))
|
||||||
safethrow(ERR_IO, StringBuilder_free(sb));
|
safethrow(ERR_IO, StringBuilder_free(sb));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
buffer[i%sizeof(buffer)]=(char)rezult;
|
buffer[i%sizeof(buffer)]=(char)result;
|
||||||
i++;
|
i++;
|
||||||
if(!(i%sizeof(buffer)))
|
if(!(i%sizeof(buffer)))
|
||||||
StringBuilder_append_string(sb,bufStr);
|
StringBuilder_append_string(sb,bufStr);
|
||||||
|
|||||||
@ -22,7 +22,7 @@ char* __path_concat(u32 n, ...){
|
|||||||
const char* output=totality;
|
const char* output=totality;
|
||||||
totality[totalLength]=0;
|
totality[totalLength]=0;
|
||||||
|
|
||||||
// copying content of all strings to rezult
|
// copying content of all strings to result
|
||||||
u16 k=0;
|
u16 k=0;
|
||||||
for(; k<n-1; k++){
|
for(; k<n-1; k++){
|
||||||
memcopy(parts[k], totality, lengths[k]);
|
memcopy(parts[k], totality, lengths[k]);
|
||||||
@ -74,11 +74,11 @@ char* path_parentDir(char* dir){
|
|||||||
|
|
||||||
char* path_basename(char* path, bool with_extension){
|
char* path_basename(char* path, bool with_extension){
|
||||||
i32 nameIndex=cptr_lastIndexOfChar(path, path_sep)+1;
|
i32 nameIndex=cptr_lastIndexOfChar(path, path_sep)+1;
|
||||||
string rezult=string_fromCptr(path+nameIndex);
|
string result=string_fromCptr(path+nameIndex);
|
||||||
if(!with_extension){
|
if(!with_extension){
|
||||||
i32 extIndex=cptr_lastIndexOfChar(rezult.ptr, '.');
|
i32 extIndex=cptr_lastIndexOfChar(result.ptr, '.');
|
||||||
if(extIndex!=0 && extIndex!=-1)
|
if(extIndex!=0 && extIndex!=-1)
|
||||||
rezult.length=extIndex;
|
result.length=extIndex;
|
||||||
}
|
}
|
||||||
return string_extract(rezult);
|
return string_extract(result);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -160,7 +160,7 @@ char* __cptr_concat(u32 n, ...){
|
|||||||
char* output=totality;
|
char* output=totality;
|
||||||
totality[totalLength]=0;
|
totality[totalLength]=0;
|
||||||
|
|
||||||
// copying content of all strings to rezult
|
// copying content of all strings to result
|
||||||
for(u16 k=0; k<n; k++){
|
for(u16 k=0; k<n; k++){
|
||||||
memcopy(strs[k], totality, lengths[k]);
|
memcopy(strs[k], totality, lengths[k]);
|
||||||
totality+=lengths[k];
|
totality+=lengths[k];
|
||||||
@ -212,6 +212,6 @@ char* cptr_replaceIn(const char* src, const char* str_old, const char* str_new,
|
|||||||
u32 src_remains_len=cptr_length(src);
|
u32 src_remains_len=cptr_length(src);
|
||||||
if(src_remains_len>0)
|
if(src_remains_len>0)
|
||||||
StringBuilder_append_string(sb, (string){.ptr=(char*)src, .length=src_remains_len});
|
StringBuilder_append_string(sb, (string){.ptr=(char*)src, .length=src_remains_len});
|
||||||
string rezult=StringBuilder_build(sb);
|
string result=StringBuilder_build(sb);
|
||||||
return rezult.ptr;
|
return result.ptr;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -25,23 +25,23 @@ char* errname(ErrorId err){
|
|||||||
|
|
||||||
char* __genErrMsg(const char* errmsg, const char* srcfile, i32 line, const char* funcname){
|
char* __genErrMsg(const char* errmsg, const char* srcfile, i32 line, const char* funcname){
|
||||||
size_t bufsize=ERRMSG_MAXLENGTH;
|
size_t bufsize=ERRMSG_MAXLENGTH;
|
||||||
char* rezult=malloc(bufsize);
|
char* result=malloc(bufsize);
|
||||||
IFMSC(
|
IFMSC(
|
||||||
sprintf_s(rezult,bufsize,"[%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(rezult,"[%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){
|
char* __extendErrMsg(const char* errmsg, const char* srcfile, i32 line, const char* funcname){
|
||||||
size_t bufsize=cptr_length(errmsg)+ERRMSG_MAXLENGTH;
|
size_t bufsize=cptr_length(errmsg)+ERRMSG_MAXLENGTH;
|
||||||
char* rezult=malloc(bufsize);
|
char* result=malloc(bufsize);
|
||||||
IFMSC(
|
IFMSC(
|
||||||
sprintf_s(rezult,bufsize,"%s\n \\___[%s:%d] %s()",errmsg,srcfile,line,funcname),
|
sprintf_s(result,bufsize,"%s\n \\___[%s:%d] %s()",errmsg,srcfile,line,funcname),
|
||||||
sprintf(rezult,"%s\n \\___[%s:%d] %s()",errmsg,srcfile,line,funcname)
|
sprintf(result,"%s\n \\___[%s:%d] %s()",errmsg,srcfile,line,funcname)
|
||||||
);
|
);
|
||||||
free(errmsg);
|
free(errmsg);
|
||||||
return rezult;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Maybe_free(Maybe e){
|
void Maybe_free(Maybe e){
|
||||||
|
|||||||
@ -60,10 +60,10 @@ char* __unknownErr( );
|
|||||||
__RETURN_EXCEPTION(((char*)__genErrMsg(E, __FILE__,__LINE__,__func__))); \
|
__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; \
|
freeMem; \
|
||||||
_rezult.errmsg=__extendErrMsg(_rezult.errmsg, __FILE__,__LINE__,__func__); \
|
_result.errmsg=__extendErrMsg(_result.errmsg, __FILE__,__LINE__,__func__); \
|
||||||
return _rezult; \
|
return _result; \
|
||||||
}
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
@ -73,16 +73,16 @@ char* __unknownErr( );
|
|||||||
__RETURN_EXCEPTION(((char*)__genErrMsg((__stringify_err(E)), __FILE__,__LINE__,__func__))); \
|
__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; \
|
freeMem; \
|
||||||
_rezult.errmsg=__extendErrMsg(_rezult.errmsg, __FILE__,__LINE__,__func__); \
|
_result.errmsg=__extendErrMsg(_result.errmsg, __FILE__,__LINE__,__func__); \
|
||||||
return _rezult; \
|
return _result; \
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define tryLast(_funcCall, _rezult, ON_EXIT) Maybe _rezult=_funcCall; if(_rezult.errmsg){ \
|
#define tryLast(_funcCall, _result, ON_EXIT) Maybe _result=_funcCall; if(_result.errmsg){ \
|
||||||
_rezult.errmsg=__extendErrMsg(_rezult.errmsg, __FILE__,__LINE__,__func__); \
|
_result.errmsg=__extendErrMsg(_result.errmsg, __FILE__,__LINE__,__func__); \
|
||||||
__EXIT(_rezult.errmsg); \
|
__EXIT(_result.errmsg); \
|
||||||
}
|
}
|
||||||
|
|
||||||
#if __cplusplus
|
#if __cplusplus
|
||||||
|
|||||||
@ -132,7 +132,7 @@ You can even embed it into macro in header (see kprint.h)
|
|||||||
PRAGMA_WARNING_POP
|
PRAGMA_WARNING_POP
|
||||||
|
|
||||||
/// gcc throws warning on unused function return value
|
/// 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
|
#if __cplusplus
|
||||||
}
|
}
|
||||||
|
|||||||
@ -85,11 +85,11 @@ char *Unitype_toString(Unitype u, u32 fmt)
|
|||||||
valuestr = type->toString(u.VoidPtr, fmt);
|
valuestr = type->toString(u.VoidPtr, fmt);
|
||||||
else
|
else
|
||||||
valuestr = "ERR_NO_TOSTRING_FUNC";
|
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, " }");
|
", value:", valuestr, " }");
|
||||||
if (type->toString)
|
if (type->toString)
|
||||||
free(valuestr);
|
free(valuestr);
|
||||||
return rezult;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
void printuni(Unitype v)
|
void printuni(Unitype v)
|
||||||
|
|||||||
@ -53,8 +53,8 @@ Maybe __ksprint(u8 n, kp_fmt* formats, __kp_value_union* objects){
|
|||||||
StringBuilder_append_cptr(strb, mStr.value.VoidPtr);
|
StringBuilder_append_cptr(strb, mStr.value.VoidPtr);
|
||||||
Unitype_free(mStr.value);
|
Unitype_free(mStr.value);
|
||||||
}
|
}
|
||||||
char* rezult=StringBuilder_build(strb).ptr;
|
char* result=StringBuilder_build(strb).ptr;
|
||||||
return SUCCESS(UniHeapPtr(char, rezult));
|
return SUCCESS(UniHeapPtr(char, result));
|
||||||
}
|
}
|
||||||
|
|
||||||
Maybe __kfprint(FILE* file, u8 n, kp_fmt* formats, __kp_value_union* objects){
|
Maybe __kfprint(FILE* file, u8 n, kp_fmt* formats, __kp_value_union* objects){
|
||||||
|
|||||||
@ -10,9 +10,9 @@ Maybe Process_start(Process* p, const char* file_path, const char** args, int ar
|
|||||||
memset(p, 0, sizeof(Process));
|
memset(p, 0, sizeof(Process));
|
||||||
if(search_in_PATH && !cptr_contains(file_path, "\\")){
|
if(search_in_PATH && !cptr_contains(file_path, "\\")){
|
||||||
LPSTR lpFilePart;
|
LPSTR lpFilePart;
|
||||||
char search_rezult[MAX_PATH];
|
char search_result[MAX_PATH];
|
||||||
safethrow_if_false(SearchPath( NULL, file_path, NULL, MAX_PATH, search_rezult, &lpFilePart))
|
safethrow_if_false(SearchPath( NULL, file_path, NULL, MAX_PATH, search_result, &lpFilePart))
|
||||||
file_path = cptr_copy(search_rezult);
|
file_path = cptr_copy(search_result);
|
||||||
}
|
}
|
||||||
|
|
||||||
SECURITY_ATTRIBUTES saAttr;
|
SECURITY_ATTRIBUTES saAttr;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user