apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

libluna: Run lint scripts
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
apio 2023-04-23 10:53:48 +02:00
parent 2f2b45758e
commit 37547ec640
Signed by: apio
GPG Key ID: B8A7D06E42258954
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libluna/include/luna/CString.h
View File

@ -29,8 +29,8 @@ extern "C"
[[deprecated]] char* strcpy(char* dst, const char* src); [[deprecated]] char* strcpy(char* dst, const char* src);
[[deprecated]] char* strcat(char* dst, const char* src); [[deprecated]] char* strcat(char* dst, const char* src);
char* strncpy(char* dest, const char* src, size_t max); char* strncpy(char* dest, const char* src, usize max);
char* strncat(char* dest, const char* src, size_t max); char* strncat(char* dest, const char* src, usize max);
char* strchr(const char* str, int c); char* strchr(const char* str, int c);
char* strrchr(const char* str, int c); char* strrchr(const char* str, int c);

2
libluna/include/luna/StaticString.h
View File

@ -11,7 +11,7 @@ template <usize Size> class StaticString
adopt(string); adopt(string);
} }
template<usize OtherSize> StaticString(const StaticString<OtherSize>& other) template <usize OtherSize> StaticString(const StaticString<OtherSize>& other)
{ {
adopt(other.chars()); adopt(other.chars());
} }

12
libluna/src/CString.cpp
View File

@ -67,7 +67,7 @@ extern "C"
int strncmp(const char* a, const char* b, usize max) int strncmp(const char* a, const char* b, usize max)
{ {
const char* s = a; const char* s = a;
while (*a && (*a == *b) && (size_t)(a - s) < (max - 1)) while (*a && (*a == *b) && (usize)(a - s) < (max - 1))
{ {
a++; a++;
b++; b++;
@ -124,18 +124,18 @@ extern "C"
return s; return s;
} }
char* strncpy(char* dest, const char* src, size_t max) char* strncpy(char* dest, const char* src, usize max)
{ {
size_t i; usize i;
for (i = 0; i < max && src[i] != 0; i++) dest[i] = src[i]; for (i = 0; i < max && src[i] != 0; i++) dest[i] = src[i];
for (; i < max; i++) dest[i] = 0; for (; i < max; i++) dest[i] = 0;
return dest; return dest;
} }
char* strncat(char* dest, const char* src, size_t max) char* strncat(char* dest, const char* src, usize max)
{ {
size_t len = strlen(dest); usize len = strlen(dest);
size_t i; usize i;
for (i = 0; i < max && *(src + i); i++) *(dest + len + i) = *(src + i); for (i = 0; i < max && *(src + i); i++) *(dest + len + i) = *(src + i);