diff options
| author | Wayne Davison <wayned@users.sourceforge.net> | 2006-03-07 21:30:36 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@users.sourceforge.net> | 2006-03-07 21:30:36 +0000 |
| commit | 4cb83571c45670eb8111801499281ea416b5074d (patch) | |
| tree | e46e881ad2f0ace5a02761e7cdb4f808df12d9f5 /Src/Modules/langinfo.c | |
| parent | e17fc5079394ce0c30dc0573676983e6f4a0a5bc (diff) | |
| download | zsh-4cb83571c45670eb8111801499281ea416b5074d.tar.gz zsh-4cb83571c45670eb8111801499281ea416b5074d.tar.xz zsh-4cb83571c45670eb8111801499281ea416b5074d.zip | |
Changed some structures to avoid gcc's type-punned warnings.
Diffstat (limited to 'Src/Modules/langinfo.c')
| -rw-r--r-- | Src/Modules/langinfo.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Src/Modules/langinfo.c b/Src/Modules/langinfo.c index 10754e36c..d927358ed 100644 --- a/Src/Modules/langinfo.c +++ b/Src/Modules/langinfo.c @@ -446,8 +446,8 @@ getlanginfo(UNUSED(HashTable ht), char *name) unmetafy(name, &len); pm = (Param) hcalloc(sizeof(struct param)); - pm->nam = dupstring(name); - pm->flags = PM_READONLY | PM_SCALAR; + pm->node.nam = dupstring(name); + pm->node.flags = PM_READONLY | PM_SCALAR; pm->gsu.s = &nullsetscalar_gsu; if(name) @@ -462,9 +462,9 @@ getlanginfo(UNUSED(HashTable ht), char *name) { /* zwarn("no such lang info: %s", name, 0); */ pm->u.str = dupstring(""); - pm->flags |= PM_UNSET; + pm->node.flags |= PM_UNSET; } - return (HashNode) pm; + return &pm->node; } /**/ @@ -477,14 +477,14 @@ scanlanginfo(UNUSED(HashTable ht), ScanFunc func, int flags) pm = (Param) hcalloc(sizeof(struct param)); pm->gsu.s = &nullsetscalar_gsu; - pm->flags = PM_READONLY | PM_SCALAR; + pm->node.flags = PM_READONLY | PM_SCALAR; nlcode = &nl_vals[0]; for (element = (char **)nl_names; *element; element++, nlcode++) { if ((langstr = nl_langinfo(*nlcode)) != NULL) { pm->u.str = dupstring(langstr); - pm->nam = dupstring(*element); - func((HashNode) pm, flags); + pm->node.nam = dupstring(*element); + func(&pm->node, flags); } } @@ -522,7 +522,7 @@ cleanup_(UNUSED(Module m)) if ((pm = (Param) paramtab->getnode(paramtab, langinfo_nam)) && pm == langinfo_pm) { - pm->flags &= ~PM_READONLY; + pm->node.flags &= ~PM_READONLY; unsetparam_pm(pm, 0, 1); } #endif |