fix more gcc-4.6 warnings
../conf.c:153:7: warning: variable 'ret' set but not used [-Wunused-but-set-variable] ../jmcore.c:214:7: warning: variable 'ret' set but not used [-Wunused-but-set-variable] ../daemon/cmd_save_project.c:45:8: warning: variable 'ret' set but not used [-Wunused-but-set-variable] ../daemon/main.c:288:7: warning: variable 'ret' set but not used [-Wunused-but-set-variable]
This commit is contained in:
parent
68716ee66c
commit
8bc41a21a0
4
conf.c
4
conf.c
|
@ -150,8 +150,6 @@ bool install_term_signal_handler(int signum, bool ignore_if_already_ignored)
|
||||||
|
|
||||||
int main(int argc, char ** argv)
|
int main(int argc, char ** argv)
|
||||||
{
|
{
|
||||||
int ret;
|
|
||||||
|
|
||||||
if (getenv("HOME") == NULL)
|
if (getenv("HOME") == NULL)
|
||||||
{
|
{
|
||||||
log_error("Environment variable HOME not set");
|
log_error("Environment variable HOME not set");
|
||||||
|
@ -174,8 +172,6 @@ int main(int argc, char ** argv)
|
||||||
dbus_connection_read_write_dispatch(cdbus_g_dbus_connection, 50);
|
dbus_connection_read_write_dispatch(cdbus_g_dbus_connection, 50);
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = 0;
|
|
||||||
|
|
||||||
disconnect_dbus();
|
disconnect_dbus();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
/*
|
/*
|
||||||
* LADI Session Handler (ladish)
|
* LADI Session Handler (ladish)
|
||||||
*
|
*
|
||||||
* Copyright (C) 2010 Nedko Arnaudov <nedko@arnaudov.name>
|
* Copyright (C) 2010,2011 Nedko Arnaudov <nedko@arnaudov.name>
|
||||||
*
|
*
|
||||||
**************************************************************************
|
**************************************************************************
|
||||||
* This file contains implementation of the "save project" command
|
* This file contains implementation of the "save project" command
|
||||||
|
@ -42,7 +42,6 @@ struct ladish_command_save_project
|
||||||
|
|
||||||
static bool run(void * command_context)
|
static bool run(void * command_context)
|
||||||
{
|
{
|
||||||
bool ret;
|
|
||||||
ladish_room_handle room;
|
ladish_room_handle room;
|
||||||
|
|
||||||
ASSERT(cmd_ptr->command.state == LADISH_COMMAND_STATE_PENDING);
|
ASSERT(cmd_ptr->command.state == LADISH_COMMAND_STATE_PENDING);
|
||||||
|
@ -55,7 +54,7 @@ static bool run(void * command_context)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = ladish_room_save_project(room, cmd_ptr->project_dir, cmd_ptr->project_name);
|
ladish_room_save_project(room, cmd_ptr->project_dir, cmd_ptr->project_name);
|
||||||
|
|
||||||
cmd_ptr->command.state = LADISH_COMMAND_STATE_DONE;
|
cmd_ptr->command.state = LADISH_COMMAND_STATE_DONE;
|
||||||
|
|
||||||
|
|
|
@ -437,5 +437,5 @@ exit:
|
||||||
log_info("LADI session handler deactivated");
|
log_info("LADI session handler deactivated");
|
||||||
log_info("------------------");
|
log_info("------------------");
|
||||||
|
|
||||||
exit(EXIT_SUCCESS);
|
exit(ret);
|
||||||
}
|
}
|
||||||
|
|
4
jmcore.c
4
jmcore.c
|
@ -211,8 +211,6 @@ bool install_term_signal_handler(int signum, bool ignore_if_already_ignored)
|
||||||
|
|
||||||
int main(int argc, char ** argv)
|
int main(int argc, char ** argv)
|
||||||
{
|
{
|
||||||
int ret;
|
|
||||||
|
|
||||||
INIT_LIST_HEAD(&g_pairs);
|
INIT_LIST_HEAD(&g_pairs);
|
||||||
|
|
||||||
install_term_signal_handler(SIGTERM, false);
|
install_term_signal_handler(SIGTERM, false);
|
||||||
|
@ -230,8 +228,6 @@ int main(int argc, char ** argv)
|
||||||
bury_zombie_pairs();
|
bury_zombie_pairs();
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = 0;
|
|
||||||
|
|
||||||
while (!list_empty(&g_pairs))
|
while (!list_empty(&g_pairs))
|
||||||
{
|
{
|
||||||
destroy_pair(list_entry(g_pairs.next, struct port_pair, siblings));
|
destroy_pair(list_entry(g_pairs.next, struct port_pair, siblings));
|
||||||
|
|
Loading…
Reference in New Issue