mirror of
https://github.com/OpenNebula/one.git
synced 2024-12-23 17:33:56 +03:00
Some minor bugs
git-svn-id: http://svn.opennebula.org/trunk@75 3034c82b-c49b-4eb3-8279-a7acafdc01c0
This commit is contained in:
parent
2d62d1cf95
commit
4906d91bdf
@ -60,9 +60,9 @@ private:
|
||||
|
||||
static const char error_names[];
|
||||
|
||||
MessageType log_level;
|
||||
MessageType log_level;
|
||||
|
||||
const char * log_file;
|
||||
char * log_file;
|
||||
};
|
||||
|
||||
#endif /* _LOG_H_ */
|
||||
|
@ -88,7 +88,7 @@ NebulaTemplate::NebulaTemplate(string& nebula_location)
|
||||
|
||||
int NebulaTemplate::load_configuration()
|
||||
{
|
||||
char * error;
|
||||
char * error = 0;
|
||||
map<string, Attribute *>::iterator iter, j;
|
||||
int rc;
|
||||
|
||||
@ -97,10 +97,10 @@ int NebulaTemplate::load_configuration()
|
||||
|
||||
rc = parse(conf_file.c_str(), &error);
|
||||
|
||||
if ( rc != 0 )
|
||||
if ( rc != 0 && error != 0)
|
||||
{
|
||||
|
||||
std::cout << "\nError while parsing configuration file:\n" << error << std::endl;
|
||||
cout << "\nError while parsing configuration file:\n" << error << endl;
|
||||
|
||||
free(error);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user