kwo pushed a commit to branch master. http://git.enlightenment.org/e16/e16.git/commit/?id=71d85605f4c1cf045e7ded3d98d51b2669720600
commit 71d85605f4c1cf045e7ded3d98d51b2669720600 Author: Kim Woelders <[email protected]> Date: Wed Apr 3 21:54:05 2013 +0200 Exec/spawn function tweaks. EexecCmd() -> Eexec(). Espawn() -> _Espawn(). EspawnCmd() -> Espawn(). --- src/E.h | 5 ++--- src/actions.c | 12 ++++++------ src/session.c | 4 ++-- src/snaps.c | 2 +- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/E.h b/src/E.h index 3390a39..805ffc0 100644 --- a/src/E.h +++ b/src/E.h @@ -458,10 +458,9 @@ void About(void); /* actions.c */ #define EXEC_SET_LANG 0x01 #define EXEC_SET_STARTUP_ID 0x02 -void EexecCmd(const char *cmd); +void Eexec(const char *cmd); int EspawnApplication(const char *params, int flags); -void Espawn(int argc, char **argv); -void EspawnCmd(const char *cmd); +void Espawn(const char *cmd); int Esystem(const char *cmd); /* config.c */ diff --git a/src/actions.c b/src/actions.c index 86ea5a3..5642c52 100644 --- a/src/actions.c +++ b/src/actions.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2013 Kim Woelders + * Copyright (C) 2004-2014 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -27,7 +27,7 @@ #include "user.h" void -EexecCmd(const char *cmd) +Eexec(const char *cmd) { char **lst; int fd, num; @@ -193,8 +193,8 @@ EspawnApplication(const char *params, int flags) exit(100); } -void -Espawn(int argc __UNUSED__, char **argv) +static void +_Espawn(int argc __UNUSED__, char **argv) { if (!argv || !argv[0]) return; @@ -211,13 +211,13 @@ Espawn(int argc __UNUSED__, char **argv) } void -EspawnCmd(const char *cmd) +Espawn(const char *cmd) { int argc; char **argv; argv = StrlistDecodeEscaped(cmd, &argc); - Espawn(argc, argv); + _Espawn(argc, argv); StrlistFree(argv, argc); } diff --git a/src/session.c b/src/session.c index 59cecf1..0fc0575 100644 --- a/src/session.c +++ b/src/session.c @@ -521,7 +521,7 @@ doSMExit(int mode, const char *params) if (EDebug(EDBUG_TYPE_SESSION)) Eprintf("doSMExit: exec %s\n", params); - EexecCmd(params); + Eexec(params); break; case EEXIT_THEME: @@ -559,7 +559,7 @@ doSMExit(int mode, const char *params) if (EDebug(EDBUG_TYPE_SESSION)) Eprintf("doSMExit: exec %s\n", s); - EexecCmd(s); + Eexec(s); break; } diff --git a/src/snaps.c b/src/snaps.c index 9ea1132..1f6a090 100644 --- a/src/snaps.c +++ b/src/snaps.c @@ -1184,7 +1184,7 @@ SnapshotsSpawn(void) !sn->used && !(sn->match_flags & SNAP_MATCH_MULTIPLE)) { sn->startup_id = ++Mode.apps.startup_id; - EspawnCmd(sn->cmd); + Espawn(sn->cmd); } } } --
