diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-04-07 16:16:32 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-04-07 16:16:32 +0000 |
| commit | a1a6c59885d543c9f9a36f1ed820bfd5f0abfae2 (patch) | |
| tree | 93565340a7e95beed8ba4a20d99abf913db5038b /app/xkbevd/cfgparse.y | |
| parent | 0af097659919230ae45a3e0058a59d486a54fb57 (diff) | |
Update to xkbevd 1.1.3
Diffstat (limited to 'app/xkbevd/cfgparse.y')
| -rw-r--r-- | app/xkbevd/cfgparse.y | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/xkbevd/cfgparse.y b/app/xkbevd/cfgparse.y index ed3441637..033b752a6 100644 --- a/app/xkbevd/cfgparse.y +++ b/app/xkbevd/cfgparse.y @@ -65,6 +65,7 @@ #endif #define DEBUG_VAR parseDebug #include "xkbevd.h" +#include <stdlib.h> %} %right EQUALS %left PLUS MINUS @@ -107,7 +108,7 @@ CfgEntry : EventDef ActionDef if (($1)&&($2)) $1->action= *($2); if ($2) - uFree($2); + free($2); $$= $1; } | VarDef { $$= $1; } @@ -116,7 +117,7 @@ CfgEntry : EventDef ActionDef VarDef : Ident EQUALS NameSpec { CfgEntryPtr cfg; - cfg= uTypedCalloc(1,CfgEntryRec); + cfg= calloc(1,sizeof(CfgEntryRec)); if (cfg) { cfg->entry_type= VariableDef; cfg->event_type= 0; @@ -133,7 +134,7 @@ VarDef : Ident EQUALS NameSpec EventDef : EventType OPAREN OptNameSpec CPAREN { CfgEntryPtr cfg; - cfg= uTypedCalloc(1,CfgEntryRec); + cfg= calloc(1,sizeof(CfgEntryRec)); if (cfg) { cfg->entry_type= EventDef; cfg->event_type= $1; @@ -155,7 +156,7 @@ EventType : BELL { $$= XkbBellNotify; } ActionDef : ActionType OptString { ActDefPtr act; - act= uTypedCalloc(1,ActDefRec); + act= calloc(1,sizeof(ActDefRec)); if (act) { act->type= $1; act->text= $2; |