diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2009-02-19 10:12:37 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2009-02-19 10:12:37 +0000 |
| commit | 64d011185ad8e65aabf3b18d07d2f5b29e804ae1 (patch) | |
| tree | fecf212b9776dc9931a49e933951efdc0d6e390d | |
| parent | 6d52e0ae1ac2f2c7cf8489599e5fb37c951aa9ef (diff) | |
| download | zsh-64d011185ad8e65aabf3b18d07d2f5b29e804ae1.tar.gz zsh-64d011185ad8e65aabf3b18d07d2f5b29e804ae1.tar.xz zsh-64d011185ad8e65aabf3b18d07d2f5b29e804ae1.zip | |
26583: use HOOK_FUNCTIONS more widely
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Src/init.c | 2 | ||||
| -rw-r--r-- | Src/utils.c | 2 | ||||
| -rw-r--r-- | Src/zsh.h | 9 |
4 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 1cf16f9c0..acace9630 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-02-19 Peter Stephenson <pws@csr.com> + + * 26583: Src/init.c, Src/zsh.h: use HOOK_SUFFIX more widely + for "*_functions" arrays. + 2009-02-18 Peter Stephenson <p.w.stephenson@ntlworld.com> * Jörg Sommer: 26582: Completion/Unix/Command/_date: --rfc-3339 @@ -11205,5 +11210,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.4572 $ +* $Revision: 1.4573 $ ***************************************************** diff --git a/Src/init.c b/Src/init.c index 341446cb9..2c059ffc2 100644 --- a/Src/init.c +++ b/Src/init.c @@ -150,7 +150,7 @@ loop(int toplevel, int justonce) if (toplevel && (getshfunc("preexec") || - paramtab->getnode(paramtab, "preexec_functions"))) { + paramtab->getnode(paramtab, "preexec" HOOK_SUFFIX))) { LinkList args; char *cmdstr; diff --git a/Src/utils.c b/Src/utils.c index 05732abb7..66b02ac88 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -1174,8 +1174,6 @@ callhookfunc(char *name, LinkList lnklst, int arrayp, int *retval) if (arrayp) { char **arrptr; int namlen = strlen(name); -#define HOOK_SUFFIX "_functions" -#define HOOK_SUFFIX_LEN 11 /* including NUL byte */ VARARR(char, arrnam, namlen + HOOK_SUFFIX_LEN); memcpy(arrnam, name, namlen); memcpy(arrnam + namlen, HOOK_SUFFIX, HOOK_SUFFIX_LEN); diff --git a/Src/zsh.h b/Src/zsh.h index 159806f2c..0b9007333 100644 --- a/Src/zsh.h +++ b/Src/zsh.h @@ -1117,6 +1117,15 @@ struct funcwrap { #define WRAPDEF(func) \ { NULL, 0, func, NULL } +/* + * User-defined hook arrays + */ + +/* Name appended to function name to get hook array */ +#define HOOK_SUFFIX "_functions" +/* Length of that including NUL byte */ +#define HOOK_SUFFIX_LEN 11 + /* node in builtin command hash table (builtintab) */ /* |