Commit 52b7b7fa authored by Thomas Braun's avatar Thomas Braun
Browse files

DataBase.cpp: Remove tmp prefix from tmp_devname variables

And rename the unchanged input as well.
parent 06d0ebc6
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -2980,25 +2980,25 @@ Tango::DevString DataBase::db_get_device_alias(Tango::DevString argin)
    /* clang-format on */

    TangoSys_MemStream sql_query_stream;
    std::string devname(argin);
    std::string tmp_devname;
    std::string devname_param(argin);
    std::string devname;
    MYSQL_RES *result;
    MYSQL_ROW row;
    int n_rows;

    argout = nullptr;

    INFO_STREAM << "DataBase::db_get_device_alias(): devname " << devname << std::endl;
    if(!check_device_name(devname))
    INFO_STREAM << "DataBase::db_get_device_alias(): devname " << devname_param << std::endl;
    if(!check_device_name(devname_param))
    {
        WARN_STREAM << "DataBase::db_get_device_alias(): device name  " << devname << " incorrect ";
        WARN_STREAM << "DataBase::db_get_device_alias(): device name  " << devname_param << " incorrect ";
        WARN_STREAM << std::endl;
        Tango::Except::throw_exception(
            DB_IncorrectDeviceName, "failed to find alias, device name incorrect", "DataBase::db_get_device_alias()");
    }

    tmp_devname = replace_wildcard(devname.c_str());
    sql_query_stream << "SELECT DISTINCT alias FROM device WHERE name LIKE \"" << tmp_devname << "\" ORDER BY alias";
    devname = replace_wildcard(devname_param.c_str());
    sql_query_stream << "SELECT DISTINCT alias FROM device WHERE name LIKE \"" << devname << "\" ORDER BY alias";
    DEBUG_STREAM << "DataBase::db_get_device_alias(): sql_query " << sql_query_stream.str() << std::endl;

    DatabaseConnectionHandle dch(dcp);