1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 16:37:47 +00:00

Big, possibly complete sweep of naming changes.

This commit is contained in:
Andreas Kling 2019-01-31 17:31:23 +01:00
parent 27fa09aee4
commit ffab6897aa
93 changed files with 830 additions and 885 deletions

View file

@ -98,7 +98,7 @@ next_entry:
auto& e_gid_string = parts[2];
auto& e_members_string = parts[3];
bool ok;
gid_t e_gid = e_gid_string.toUInt(ok);
gid_t e_gid = e_gid_string.to_uint(ok);
if (!ok) {
fprintf(stderr, "getgrent(): Malformed GID on line %u\n", __grdb_line_number);
goto next_entry;

View file

@ -102,12 +102,12 @@ next_entry:
auto& e_dir = parts[5];
auto& e_shell = parts[6];
bool ok;
uid_t e_uid = e_uid_string.toUInt(ok);
uid_t e_uid = e_uid_string.to_uint(ok);
if (!ok) {
fprintf(stderr, "getpwent(): Malformed UID on line %u\n", __pwdb_line_number);
goto next_entry;
}
gid_t e_gid = e_gid_string.toUInt(ok);
gid_t e_gid = e_gid_string.to_uint(ok);
if (!ok) {
fprintf(stderr, "getpwent(): Malformed GID on line %u\n", __pwdb_line_number);
goto next_entry;

View file

@ -35,7 +35,7 @@
#define MAXLN 512
static const char* determineBase(const char* p, int& base)
static const char* determine_base(const char* p, int& base)
{
if (p[0] == '0') {
switch (p[1]) {
@ -111,7 +111,7 @@ int atob(unsigned int* vp, const char* p, int base)
unsigned long v;
if (base == 0)
p = determineBase(p, base);
p = determine_base(p, base);
if (_atob(&v, p, base)) {
*vp = v;
return 1;

View file

@ -237,7 +237,7 @@ int dbgprintf(const char* fmt, ...)
{
va_list ap;
va_start(ap, fmt);
int ret = printfInternal(sys_putch, nullptr, fmt, ap);
int ret = printf_internal(sys_putch, nullptr, fmt, ap);
va_end(ap);
return ret;
}
@ -256,7 +256,7 @@ static void stream_putch(char*&, char ch)
int vfprintf(FILE* stream, const char* fmt, va_list ap)
{
__current_stream = stream;
return printfInternal(stream_putch, nullptr, fmt, ap);
return printf_internal(stream_putch, nullptr, fmt, ap);
}
int fprintf(FILE* stream, const char* fmt, ...)
@ -272,7 +272,7 @@ int printf(const char* fmt, ...)
{
va_list ap;
va_start(ap, fmt);
int ret = printfInternal(stdout_putch, nullptr, fmt, ap);
int ret = printf_internal(stdout_putch, nullptr, fmt, ap);
va_end(ap);
return ret;
}
@ -284,7 +284,7 @@ static void buffer_putch(char*& bufptr, char ch)
int vsprintf(char* buffer, const char* fmt, va_list ap)
{
int ret = printfInternal(buffer_putch, buffer, fmt, ap);
int ret = printf_internal(buffer_putch, buffer, fmt, ap);
buffer[ret] = '\0';
return ret;
}
@ -311,7 +311,7 @@ static void sized_buffer_putch(char*& bufptr, char ch)
int vsnprintf(char* buffer, size_t size, const char* fmt, va_list ap)
{
__vsnprintf_space_remaining = size;
int ret = printfInternal(sized_buffer_putch, buffer, fmt, ap);
int ret = printf_internal(sized_buffer_putch, buffer, fmt, ap);
buffer[ret] = '\0';
return ret;
}

View file

@ -190,21 +190,21 @@ char* strrchr(const char* str, int ch)
char* strcat(char *dest, const char *src)
{
size_t destLength = strlen(dest);
size_t dest_length = strlen(dest);
size_t i;
for (i = 0 ; src[i] != '\0' ; i++)
dest[destLength + i] = src[i];
dest[destLength + i] = '\0';
dest[dest_length + i] = src[i];
dest[dest_length + i] = '\0';
return dest;
}
char* strncat(char *dest, const char *src, size_t n)
{
size_t destLength = strlen(dest);
size_t dest_length = strlen(dest);
size_t i;
for (i = 0 ; i < n && src[i] != '\0' ; i++)
dest[destLength + i] = src[i];
dest[destLength + i] = '\0';
dest[dest_length + i] = src[i];
dest[dest_length + i] = '\0';
return dest;
}