Commit 6b44e2cb authored by Thomas Braun's avatar Thomas Braun
Browse files

DataBase.cpp: Remove tmp prefix from tmp_ptr variables 

And name it properly.
parent bd744e76

DataBase.cpp

+12 −12
Original line number Diff line number Diff line
@@ -1651,10 +1651,10 @@ void DataBase::db_delete_server(Tango::DevString argin) 
        adm_dev += server;

        try

        {

            char *tmp_ptr = db_get_device_host_impl((Tango::DevString) adm_dev.c_str(), al.get_dch());

            previous_host = tmp_ptr;

            char *host = db_get_device_host_impl((Tango::DevString) adm_dev.c_str(), al.get_dch());

            previous_host = host;

            DEBUG_STREAM << server << " was running on " << previous_host << std::endl;

            CORBA::string_free(tmp_ptr);

            CORBA::string_free(host);

        }

        catch(Tango::DevFailed &e)

        {
@@ -1827,10 +1827,10 @@ void DataBase::db_export_device(const Tango::DevVarStringArray *argin) 
                if(device != adm_dev && device.substr(0, 16) != "dserver/starter/")

                {

                    do_fire = true;

                    char *tmp_ptr = db_get_device_host_impl((Tango::DevString) device.c_str(), al.get_dch());

                    previous_host = tmp_ptr;

                    char *host_local = db_get_device_host_impl((Tango::DevString) device.c_str(), al.get_dch());

                    previous_host = host_local;

                    DEBUG_STREAM << device << " was running on " << previous_host << std::endl;

                    CORBA::string_free(tmp_ptr);

                    CORBA::string_free(host_local);

                }

            }

        }
@@ -6892,10 +6892,10 @@ void DataBase::db_put_server_info(const Tango::DevVarStringArray *argin) 
                std::string adm_dev = "dserver/";

                adm_dev += server;



                char *tmp_ptr = db_get_device_host_impl((Tango::DevString) adm_dev.c_str(), al.get_dch());

                previous_host = tmp_ptr;

                char *host_local = db_get_device_host_impl((Tango::DevString) adm_dev.c_str(), al.get_dch());

                previous_host = host_local;

                DEBUG_STREAM << server << " was running on " << previous_host << std::endl;

                CORBA::string_free(tmp_ptr);

                CORBA::string_free(host_local);

            }

        }

        // first delete the server from the server table
@@ -7692,10 +7692,10 @@ void DataBase::db_rename_server(const Tango::DevVarStringArray *argin) 
        adm_dev += old_name;

        try

        {

            char *tmp_ptr = db_get_device_host((Tango::DevString) adm_dev.c_str());

            previous_host = tmp_ptr;

            char *host = db_get_device_host((Tango::DevString) adm_dev.c_str());

            previous_host = host;

            DEBUG_STREAM << old_name << " was running on " << previous_host << std::endl;

            CORBA::string_free(tmp_ptr);

            CORBA::string_free(host);

        }

        catch(Tango::DevFailed &e)

        {