mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 21:07:34 +00:00
Revert "Userland: static vs non-static constexpr variables"
This reverts commit 800ea8ea96
.
Booting the system no longer worked after these changes.
This commit is contained in:
parent
68f76b9e37
commit
d60ebbbba6
38 changed files with 184 additions and 192 deletions
|
@ -36,7 +36,7 @@ static constexpr i32 lookup_server_endpoint_magic = 9001;
|
|||
|
||||
// Get service entry buffers and file information for the getservent() family of functions.
|
||||
static FILE* services_file = nullptr;
|
||||
static constexpr char services_path[] = "/etc/services";
|
||||
static const char* services_path = "/etc/services";
|
||||
|
||||
static bool fill_getserv_buffers(const char* line, ssize_t read);
|
||||
static servent __getserv_buffer;
|
||||
|
@ -50,7 +50,7 @@ static ssize_t service_file_offset = 0;
|
|||
|
||||
// Get protocol entry buffers and file information for the getprotent() family of functions.
|
||||
static FILE* protocols_file = nullptr;
|
||||
static constexpr char protocols_path[] = "/etc/protocols";
|
||||
static const char* protocols_path = "/etc/protocols";
|
||||
|
||||
static bool fill_getproto_buffers(const char* line, ssize_t read);
|
||||
static protoent __getproto_buffer;
|
||||
|
|
|
@ -70,9 +70,10 @@ char* ctime_r(const time_t* t, char* buf)
|
|||
return asctime_r(localtime_r(t, &tm_buf), buf);
|
||||
}
|
||||
|
||||
static const int __seconds_per_day = 60 * 60 * 24;
|
||||
|
||||
static void time_to_tm(struct tm* tm, time_t t)
|
||||
{
|
||||
constexpr int __seconds_per_day = 60 * 60 * 24;
|
||||
int year = 1970;
|
||||
for (; t >= days_in_year(year) * __seconds_per_day; ++year)
|
||||
t -= days_in_year(year) * __seconds_per_day;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue