[apps] Revert Equal after function name

This commit is contained in:
Léa Saviot
2018-11-29 15:43:54 +01:00
parent ff33ad3ad1
commit 6e77bb4123
5 changed files with 7 additions and 20 deletions

View File

@@ -10,7 +10,6 @@ using namespace Poincare;
namespace Shared {
constexpr char StorageFunction::k_parenthesedArgument[];
constexpr char StorageFunction::k_equal[];
bool StorageFunction::BaseNameCompliant(const char * baseName, NameNotCompliantError * error) {
assert(baseName[0] != 0);
@@ -64,17 +63,11 @@ void StorageFunction::setActive(bool active) {
int StorageFunction::nameWithArgument(char * buffer, size_t bufferSize, char arg) {
const char * functionName = fullName();
size_t baseNameLength = SymbolAbstract::TruncateExtension(buffer, functionName, bufferSize - k_parenthesedArgumentLength);
strlcpy(&buffer[baseNameLength], k_parenthesedArgument, bufferSize-baseNameLength);
int result = baseNameLength + strlcpy(&buffer[baseNameLength], k_parenthesedArgument, bufferSize-baseNameLength);
if (baseNameLength+1 < bufferSize - 1) {
buffer[baseNameLength+1] = arg;
}
return strlen(buffer);
}
int StorageFunction::nameWithArgumentAndEqual(char * buffer, size_t bufferSize, char arg) {
int numberOfChars = nameWithArgument(buffer, bufferSize, arg);
strlcpy(&buffer[numberOfChars], k_equal, bufferSize-numberOfChars);
return strlen(buffer);
return result;
}
template<typename T>