소스 검색

LibCore: Change DateTime format strings to be StringViews

There's no need to allocate a String for these. Note the "string"
parameter of DateTime::parse is left as a String for now; the parser is
currently using strtol which needs a NUL-terminated string. This method
can likely be rewritten with GenericLexer.
Timothy Flynn 3 년 전
부모
커밋
b387ac56b6
2개의 변경된 파일5개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 2
      Userland/Libraries/LibCore/DateTime.cpp
  2. 3 2
      Userland/Libraries/LibCore/DateTime.h

+ 2 - 2
Userland/Libraries/LibCore/DateTime.cpp

@@ -83,7 +83,7 @@ void DateTime::set_time(int year, int month, int day, int hour, int minute, int
     m_second = tm.tm_sec;
 }
 
-String DateTime::to_string(const String& format) const
+String DateTime::to_string(StringView format) const
 {
     const char wday_short_names[7][4] = {
         "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
@@ -261,7 +261,7 @@ String DateTime::to_string(const String& format) const
     return builder.build();
 }
 
-Optional<DateTime> DateTime::parse(const String& format, const String& string)
+Optional<DateTime> DateTime::parse(StringView format, const String& string)
 {
     unsigned format_pos = 0;
     unsigned string_pos = 0;

+ 3 - 2
Userland/Libraries/LibCore/DateTime.h

@@ -7,6 +7,7 @@
 #pragma once
 
 #include <AK/String.h>
+#include <AK/StringView.h>
 #include <LibIPC/Forward.h>
 #include <time.h>
 
@@ -30,12 +31,12 @@ public:
     bool is_leap_year() const;
 
     void set_time(int year, int month = 1, int day = 1, int hour = 0, int minute = 0, int second = 0);
-    String to_string(const String& format = "%Y-%m-%d %H:%M:%S") const;
+    String to_string(StringView format = "%Y-%m-%d %H:%M:%S"sv) const;
 
     static DateTime create(int year, int month = 1, int day = 1, int hour = 0, int minute = 0, int second = 0);
     static DateTime now();
     static DateTime from_timestamp(time_t);
-    static Optional<DateTime> parse(const String& format, const String& string);
+    static Optional<DateTime> parse(StringView format, const String& string);
 
     bool operator<(const DateTime& other) const { return m_timestamp < other.m_timestamp; }