diff options
author | Peter Stephenson <pws@users.sourceforge.net> | 2003-10-29 19:17:30 +0000 |
---|---|---|
committer | Peter Stephenson <pws@users.sourceforge.net> | 2003-10-29 19:17:30 +0000 |
commit | 815bc92148939ce369585c59d3af730f69833844 (patch) | |
tree | 2787fe59d0c8b27c6a9cf18e65784cdbd925c9b1 /Src/Modules | |
parent | 026631ab818995ad480a9ea3e5a7ec243c645db1 (diff) | |
download | zsh-815bc92148939ce369585c59d3af730f69833844.tar.gz zsh-815bc92148939ce369585c59d3af730f69833844.tar.xz zsh-815bc92148939ce369585c59d3af730f69833844.zip |
a la 19209: zcalloc -> zshcalloc
Diffstat (limited to 'Src/Modules')
-rw-r--r-- | Src/Modules/parameter.c | 8 | ||||
-rw-r--r-- | Src/Modules/stat.c | 4 | ||||
-rw-r--r-- | Src/Modules/tcp.c | 2 | ||||
-rw-r--r-- | Src/Modules/zftp.c | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/Src/Modules/parameter.c b/Src/Modules/parameter.c index 8e70e111d..eb03b9d7d 100644 --- a/Src/Modules/parameter.c +++ b/Src/Modules/parameter.c @@ -202,7 +202,7 @@ setpmcommand(Param pm, char *value) zwarn("restricted: %s", value, 0); zsfree(value); } else { - Cmdnam cn = zcalloc(sizeof(*cn)); + Cmdnam cn = zshcalloc(sizeof(*cn)); cn->flags = HASHED; cn->u.cmd = value; @@ -233,7 +233,7 @@ setpmcommands(Param pm, HashTable ht) for (i = 0; i < ht->hsize; i++) for (hn = ht->nodes[i]; hn; hn = hn->next) { - Cmdnam cn = zcalloc(sizeof(*cn)); + Cmdnam cn = zshcalloc(sizeof(*cn)); struct value v; v.isarr = v.inv = v.start = 0; @@ -1419,7 +1419,7 @@ setpmnameddir(Param pm, char *value) if (!value) zwarn("invalid value: ''", NULL, 0); else { - Nameddir nd = (Nameddir) zcalloc(sizeof(*nd)); + Nameddir nd = (Nameddir) zshcalloc(sizeof(*nd)); nd->flags = 0; nd->dir = value; @@ -1468,7 +1468,7 @@ setpmnameddirs(Param pm, HashTable ht) if (!(val = getstrvalue(&v))) zwarn("invalid value: ''", NULL, 0); else { - Nameddir nd = (Nameddir) zcalloc(sizeof(*nd)); + Nameddir nd = (Nameddir) zshcalloc(sizeof(*nd)); nd->flags = 0; nd->dir = ztrdup(val); diff --git a/Src/Modules/stat.c b/Src/Modules/stat.c index 5b5479711..162612ee9 100644 --- a/Src/Modules/stat.c +++ b/Src/Modules/stat.c @@ -518,7 +518,7 @@ bin_stat(char *name, char **args, Options ops, int func) arrsize = (flags & STF_PICK) ? 1 : ST_COUNT; if (flags & STF_FILE) arrsize++; - hashptr = hash = (char **)zcalloc((arrsize+1)*2*sizeof(char *)); + hashptr = hash = (char **)zshcalloc((arrsize+1)*2*sizeof(char *)); } if (arrnam) { @@ -526,7 +526,7 @@ bin_stat(char *name, char **args, Options ops, int func) if (flags & STF_FILE) arrsize++; arrsize *= nargs; - arrptr = array = (char **)zcalloc((arrsize+1)*sizeof(char *)); + arrptr = array = (char **)zshcalloc((arrsize+1)*sizeof(char *)); } for (; OPT_ISSET(ops,'f') || *args; args++) { diff --git a/Src/Modules/tcp.c b/Src/Modules/tcp.c index 2f3d0424d..8e42ead55 100644 --- a/Src/Modules/tcp.c +++ b/Src/Modules/tcp.c @@ -216,7 +216,7 @@ zts_alloc(int ztflags) { Tcp_session sess; - sess = (Tcp_session)zcalloc(sizeof(struct tcp_session)); + sess = (Tcp_session)zshcalloc(sizeof(struct tcp_session)); if (!sess) return NULL; sess->fd=-1; sess->flags=ztflags; diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c index 918061e42..d79981645 100644 --- a/Src/Modules/zftp.c +++ b/Src/Modules/zftp.c @@ -2042,7 +2042,7 @@ zftp_params(char *name, char **args, int flags) return 0; } len = arrlen(args); - newarr = (char **)zcalloc((len+1)*sizeof(char *)); + newarr = (char **)zshcalloc((len+1)*sizeof(char *)); for (aptr = args, i = 0; *aptr && !errflag; aptr++, i++) { char *str; if (**aptr == '?') @@ -2764,10 +2764,10 @@ newsession(char *nm) } if (!nptr) { - zfsess = (Zftp_session) zcalloc(sizeof(struct zftp_session)); + zfsess = (Zftp_session) zshcalloc(sizeof(struct zftp_session)); zfsess->name = ztrdup(nm); zfsess->dfd = -1; - zfsess->params = (char **) zcalloc(sizeof(zfparams)); + zfsess->params = (char **) zshcalloc(sizeof(zfparams)); zaddlinknode(zfsessions, zfsess); zfsesscnt++; |