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

-Wextra warnings fixed

Browse Source
This commit is contained in:
timerix 2023-03-15 16:54:36 +06:00
parent a200f2c965
commit a6a6d2d4ae
12 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Array/Array.c
View File

@ -17,7 +17,7 @@ Array_define(Pointer)
Array_define(Unitype)
void Array_Unitype_free_(Array_Unitype* array, bool freeMembers){
if(freeMembers) for (i32 i=0; i<array->length; i++)
if(freeMembers) for (u32 i=0; i<array->length; i++)
Unitype_free(array->values[i]);
if(array->allocatedOnHeap)
free(array->values);

4
src/Autoarr/Autoarr.h
View File

@ -26,12 +26,12 @@ Autoarr_declare(Unitype)
#define Autoarr_foreach(ar,elem,codeblock)({ \
if(ar->blocks_count>0) { \
typeof(**ar->values) elem; \
for(u32 blockI=0;blockI<ar->blocks_count-1;blockI++) \
for(u16 blockI=0;blockI<ar->blocks_count-1;blockI++) \
for(u32 elemI=0;elemI<ar->max_block_length;elemI++){ \
elem=ar->values[blockI][elemI]; \
(codeblock); \
} \
for(u32 elemI=0;elemI<ar->block_length;elemI++){ \
for(u16 elemI=0;elemI<ar->block_length;elemI++){ \
elem=ar->values[ar->blocks_count-1][elemI]; \
(codeblock); \
} \

2
src/DtsodParser/DtsodV24_deserialize.c
View File

@ -272,8 +272,10 @@ Maybe __ReadValue(DeserializeSharedData* shared, bool* readingList){
case ']':
if(!readingList) safethrow_wrongchar(c,Unitype_free(value));
*readingList=false;
goto return_value;
case ';':
case ',':
return_value:
if(valueStr.length!=0){
if(!Unitype_isUniNull(value))
safethrow_wrongchar(c,Unitype_free(value));

2
src/DtsodParser/DtsodV24_serialize.c
View File

@ -77,7 +77,7 @@ Maybe __AppendValue(SerializeSharedData* shared, Unitype u){
bool hashtableNotBlank=false;
Hashtable_foreach(((Hashtable*)u.VoidPtr), __, ({
hashtableNotBlank=true;
if(__.key); // weird way to disable warning
if(__.key) {} // weird way to disable warning
break;
}));

4
src/Filesystem/file.c
View File

@ -2,7 +2,9 @@
#include "../String/StringBuilder.h"
#include "io_includes.h"
kt_define(FileHandle, (freeMembers_t)file_close, NULL)
void __file_freeMembers(void* _f){ fclose((FileHandle)_f); }
kt_define(FileHandle, __file_freeMembers, NULL)
bool file_exists(const char* path){
if(path[0]=='.'){

6
src/Filesystem/path.c
View File

@ -1,6 +1,6 @@
#include "filesystem.h"
char* __path_concat(u16 n, ...){
char* __path_concat(u32 n, ...){
char** parts=(char**)malloc(n*sizeof(char*));
u32* lengths=malloc(n*sizeof(u32));
u32 totalLength=0;
@ -56,9 +56,9 @@ Maybe path_throwIfEscapes(const char* path){
char* path_parentDir(char* dir){
char* copy=cptr_copy(dir);
u32 length=cptr_length(copy);
i32 length=cptr_length(copy);
i32 i=cptr_lastIndexOfChar(copy,path_sep);
if(i==length-1){
if(i!=-1 && i==length-1){
copy[length-1]=0;
i=cptr_lastIndexOfChar(copy,path_sep);
}

2
src/Filesystem/path.h
View File

@ -14,7 +14,7 @@ static const char path_sep='/';
static const char path_notSep='\\';
#endif
char* __path_concat(u16 n, ...);
char* __path_concat(u32 n, ...);
/// @brief merges path parts together and puts <path_sep> between them
/// @return new cstr
#define path_concat(PATH_PARTS...) __path_concat(count_args(PATH_PARTS), PATH_PARTS)

8
src/base/cptr.c
View File

@ -50,7 +50,7 @@ bool cptr_endsWith(char* ptr, char* fragment){
u32 cptr_indexOf(char* ptr, char* fragment){
char sc=*ptr;
for(i32 si=0, fi=0; sc!=0; si++){
for(u32 si=0, fi=0; sc!='\0'; si++){
sc=ptr[si];
if(sc==fragment[fi]){
fi++;
@ -63,7 +63,7 @@ u32 cptr_indexOf(char* ptr, char* fragment){
}
u32 cptr_indexOfChar(char* ptr, char fragment){
char sc=*ptr;
for(i32 si=0; sc!=0; si++){
for(u32 si=0; sc!='\0'; si++){
sc=ptr[si];
if(sc==fragment){
return si;
@ -73,7 +73,7 @@ u32 cptr_indexOfChar(char* ptr, char fragment){
}
u32 cptr_lastIndexOf(char* ptr, char* fragment){
char sc=*ptr;
i32 fi_last=cptr_length(fragment)-1;
u32 fi_last=cptr_length(fragment)-1;
for(i32 si=cptr_length(ptr)-1, fi=fi_last; si>=0; si--){
sc=ptr[si];
if(sc==fragment[fi]){
@ -103,7 +103,7 @@ void memcopy(void* from, void* to, u32 size){
((char*)to)[i]=((char*)from)[i];
}
char* __cptr_concat(u16 n, ...){
char* __cptr_concat(u32 n, ...){
char** strs=(char**)malloc(n*sizeof(char*));
u32* lengths=malloc(n*sizeof(u32));
u32 totalLength=0;

2
src/base/cptr.h
View File

@ -44,7 +44,7 @@ static inline bool cptr_contains(char* ptr, char* fragment){
void memcopy(void* from, void* to, u32 size);
char* __cptr_concat(u16 n, ...);
char* __cptr_concat(u32 n, ...);
#define cptr_concat(STR...) __cptr_concat(count_args(STR), STR)
#if __cplusplus

3
src/base/std.h
View File

@ -116,8 +116,9 @@ You can even embed it into macro in header (see kprint.h)
#define PRAGMA_WARNING_DISABLE(wName) _PRAGMA(GCC diagnostic ignored wName)
#define PRAGMA_WARNING_POP _PRAGMA(GCC diagnostic pop)
#define W_INT_CONVERSION "-Wint-conversion"
#define W_IMPLICIT_FALLTHROUGH "-Wimplicit-fallthrough"
#endif
#define WARNING_DISABLE(WARNING, CODE) \
#define WARNING_DISABLE(WARNING, CODE...) \
PRAGMA_WARNING_PUSH \
PRAGMA_WARNING_DISABLE(WARNING) \
CODE; \

4
src/base/type_system/base_toString.c
View File

@ -113,7 +113,7 @@ char* toString_bin(void* _bytes, u32 size, bool inverse, bool withPrefix){
for(i32 bn=size-1; bn>=0; bn--)
byte_to_bits(bytes[bn])
} else {
for(i32 bn=0; bn<size; bn++)
for(u32 bn=0; bn<size; bn++)
byte_to_bits(bytes[bn])
}
str[cn]=0;
@ -155,7 +155,7 @@ char* toString_hex(void* _bytes, u32 size, bool inverse, bool withPrefix, bool u
}
// right to left
else {
for(i32 bn=0; bn<size; bn++){ // byte number
for(u32 bn=0; bn<size; bn++){ // byte number
unsigned char byte=bytes[bn];
str[cn++]=_4bitsHex(byte/16, uppercase);
str[cn++]=_4bitsHex(byte%16, uppercase);

2
src/kprint/kprintf.c
View File

@ -124,7 +124,7 @@ void kprintf(const char* format, ...){
case '5': case '6': case '7': case '8': case '9':
colorUnix=colorUnix*10+c-'0';
break;
case 'm':
case 'm': ;
WORD colorWin=unixColorToWin(colorUnix);
HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
SetConsoleTextAttribute(hConsole, colorWin);