--- parser3/src/main/pa_charsets.C 2024/11/10 20:28:15 1.28 +++ parser3/src/main/pa_charsets.C 2026/04/25 13:38:46 1.30 @@ -1,13 +1,13 @@ /** @file Parser: sql driver manager implementation. - Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com) Authors: Konstantin Morshnev , Alexandr Petrosian */ #include "pa_charsets.h" -volatile const char * IDENT_PA_CHARSETS_C="$Id: pa_charsets.C,v 1.28 2024/11/10 20:28:15 moko Exp $" IDENT_PA_CHARSETS_H; +volatile const char * IDENT_PA_CHARSETS_C="$Id: pa_charsets.C,v 1.30 2026/04/25 13:38:46 moko Exp $" IDENT_PA_CHARSETS_H; // defines for globals @@ -27,7 +27,7 @@ Charsets::Charsets() { } Charset& Charsets::get(String::Body ANAME) { - ANAME=str_upper(ANAME.cstr(), ANAME.length()); + ANAME=String::Body(str_upper(ANAME.cstr(), ANAME.length())); if(Charset* result=HashString::get(ANAME)) return *result; else @@ -52,7 +52,7 @@ Charset* Charsets::checkBOM(char *&body, } void Charsets::load_charset(Request_charsets& charsets, String::Body ANAME, const String& afile_spec) { - ANAME=str_upper(ANAME.cstr(), ANAME.length()); + ANAME=String::Body(str_upper(ANAME.cstr(), ANAME.length())); //we know that charset? if(HashString::get(ANAME)) return; // don't load it then