From d774bd68d5e068b5db6e81c2dbad6e0dd2db00c1 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sat, 7 May 2022 10:37:34 +0300 Subject: Autocommit at 07.05.2022 @ 10:37 --- src/Generic/String/String.cpp | 14 +++++++++++++- src/Services/EventService.cpp | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Generic/String/String.cpp b/src/Generic/String/String.cpp index 055f48e..b1e2889 100644 --- a/src/Generic/String/String.cpp +++ b/src/Generic/String/String.cpp @@ -18,13 +18,25 @@ void String::copyFrom(const String& other) { String::String(const char* str) { length = strlen(str) + 1; // capture terminating zero this->str = new char[length]; - strcpy(this->str, str); + strncpy(this->str, str, length); } const char* String::get_cstr() const { return str; } +String& String::operator+=(const String& other) { + char* newStr = new char[length + other.length + 1]; + strncpy(newStr, str, length); + strncat(newStr, other.str, other.length + 1); + + delete[] str; + str = newStr; + length += other.length; + + return *this; +} + String::String() : String("") {} String::String(const String& other) { diff --git a/src/Services/EventService.cpp b/src/Services/EventService.cpp index 63703be..77a2be3 100644 --- a/src/Services/EventService.cpp +++ b/src/Services/EventService.cpp @@ -138,7 +138,7 @@ StatusCode EventService::buyTicket(const char* name, const Date& date, const Tic String EventService::createSeatingString(const char*name, const Date& date) { unsigned eInd = indexOfEvent(name, date); if (eInd == events.get_count()) - return E_EventDoesNotExist; + return ""; unsigned strSize = events[eInd].get_hall().get_rows() * events[eInd].get_hall().get_seatsPerRow(); String out; -- cgit v1.3.1-26-gb76a