alois31/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge "libexpr/eval.cc: remove unnecessary C string conversion" into main

Browse source
This commit is contained in:
nan-git 2024-07-14 16:53:54 +00:00 committed by Gerrit Code Review
parent 201e8b6994 505640baec
commit 1eb5d22132
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/libexpr/eval.cc
View file

@ -65,19 +65,6 @@ static char * allocString(size_t size)
} }
static char * dupString(const char * s)
{
char * t;
#if HAVE_BOEHMGC
t = GC_STRDUP(s);
#else
t = strdup(s);
#endif
if (!t) throw std::bad_alloc();
return t;
}
// When there's no need to write to the string, we can optimize away empty // When there's no need to write to the string, we can optimize away empty
// string allocations. // string allocations.
// This function handles makeImmutableString(std::string_view()) by returning // This function handles makeImmutableString(std::string_view()) by returning
@ -889,7 +876,7 @@ static void copyContextToValue(Value & v, const NixStringContext & context)
v.string.context = (const char * *) v.string.context = (const char * *)
allocBytes((context.size() + 1) * sizeof(char *)); allocBytes((context.size() + 1) * sizeof(char *));
for (auto & i : context) for (auto & i : context)
v.string.context[n++] = dupString(i.to_string().c_str()); v.string.context[n++] = makeImmutableString(i.to_string());
v.string.context[n] = 0; v.string.context[n] = 0;
} }
} }