eeze_scanner now has separate return codes for various startup-related failures

ref T1612
This commit is contained in:
Mike Blumenkrantz 2014-12-05 13:35:14 -05:00
parent b2d47c0070
commit 3da1ac3b42
1 changed files with 4 additions and 1 deletions

View File

@ -415,6 +415,7 @@ sigs_setup(void)
int int
main(void) main(void)
{ {
int ret;
eina_init(); eina_init();
ecore_init(); ecore_init();
ecore_con_init(); ecore_con_init();
@ -427,6 +428,7 @@ main(void)
eet_setup(); eet_setup();
clients = eina_hash_pointer_new(NULL); clients = eina_hash_pointer_new(NULL);
ret = 1;
EINA_SAFETY_ON_NULL_GOTO(clients, error); EINA_SAFETY_ON_NULL_GOTO(clients, error);
ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_ADD, (Ecore_Event_Handler_Cb)cl_add, NULL); ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_ADD, (Ecore_Event_Handler_Cb)cl_add, NULL);
@ -440,6 +442,7 @@ main(void)
eeze_udev_watch_add(EEZE_UDEV_TYPE_DRIVE_MOUNTABLE, EEZE_UDEV_EVENT_NONE, cb_vol_chg, NULL); eeze_udev_watch_add(EEZE_UDEV_TYPE_DRIVE_MOUNTABLE, EEZE_UDEV_EVENT_NONE, cb_vol_chg, NULL);
svr = ecore_con_server_add(ECORE_CON_LOCAL_SYSTEM, "eeze_scanner", 0, NULL); svr = ecore_con_server_add(ECORE_CON_LOCAL_SYSTEM, "eeze_scanner", 0, NULL);
ret = 2;
EINA_SAFETY_ON_NULL_GOTO(svr, error); EINA_SAFETY_ON_NULL_GOTO(svr, error);
storage_setup(); storage_setup();
@ -449,5 +452,5 @@ main(void)
return 0; return 0;
error: error:
ERR("Could not start up!"); ERR("Could not start up!");
exit(1); exit(ret);
} }