Fix formatting in xkbcomp headers

Signed-off-by: Ran Benita <ran234@gmail.com>
[daniels: Fixed for xkb_desc -> xkb_keymap change.]

diff --git a/src/xkbcomp/action.c b/src/xkbcomp/action.c
index 25278b8..8476c8b 100644 (file)
--- a/src/xkbcomp/action.c
+++ b/src/xkbcomp/action.c
@@ -1065,12 +1065,9 @@ HandlePrivate(struct xkb_keymap * xkb,
     return ReportIllegal(PrivateAction, field);
 }
 
-typedef Bool(*actionHandler) (struct xkb_keymap * /* xkb */ ,
-                              struct xkb_any_action * /* action */ ,
-                              unsigned /* field */ ,
-                              ExprDef * /* array_ndx */ ,
-                              ExprDef * /* value */
-    );
+typedef Bool (*actionHandler) (struct xkb_keymap *xkb,
+                               struct xkb_any_action *action, unsigned field,
+                               ExprDef *array_ndx, ExprDef *value);
 
 static const actionHandler handleAction[XkbSA_NumActions + 1] = {
     [XkbSA_NoAction]       = HandleNoAction,

diff --git a/src/xkbcomp/action.h b/src/xkbcomp/action.h
index 5d4191c..137baf7 100644 (file)
--- a/src/xkbcomp/action.h
+++ b/src/xkbcomp/action.h
@@ -64,20 +64,14 @@ typedef struct _ActionInfo
     struct _ActionInfo *next;
 } ActionInfo;
 
-extern int HandleActionDef(ExprDef * /* def */ ,
-                           struct xkb_keymap * /* xkb */ ,
-                           struct xkb_any_action * /* action */ ,
-                           unsigned /* mergeMode */ ,
-                           ActionInfo * /* info */
-    );
+extern int
+HandleActionDef(ExprDef *def, struct xkb_keymap *xkb,
+                struct xkb_any_action *action, unsigned mergeMode,
+                ActionInfo *info);
 
-extern int SetActionField(struct xkb_keymap * /* xkb */ ,
-                          char * /* elem */ ,
-                          char * /* field */ ,
-                          ExprDef * /* index */ ,
-                          ExprDef * /* value */ ,
-                          ActionInfo ** /* info_rtrn */
-    );
+extern int
+SetActionField(struct xkb_keymap *xkb, char *elem, char *field,
+               ExprDef *index, ExprDef *value, ActionInfo **info_rtrn);
 
 extern const LookupEntry ctrlNames[];
 

diff --git a/src/xkbcomp/alias.h b/src/xkbcomp/alias.h
index 9883852..53e70dd 100644 (file)
--- a/src/xkbcomp/alias.h
+++ b/src/xkbcomp/alias.h
@@ -34,22 +34,17 @@ typedef struct _AliasInfo
     char real[XkbKeyNameLength + 1];
 } AliasInfo;
 
-extern int HandleAliasDef(KeyAliasDef * /* def   */ ,
-                          unsigned /* merge */ ,
-                          unsigned /* file_id */ ,
-                          AliasInfo **  /* info  */
-    );
-
-extern void ClearAliases(AliasInfo **   /* info */
-    );
-
-extern Bool MergeAliases(AliasInfo ** /* into */ ,
-                         AliasInfo ** /* merge */ ,
-                         unsigned       /* how_merge */
-    );
-
-extern int ApplyAliases(struct xkb_keymap * /* xkb */ ,
-                        AliasInfo **    /* info */
-    );
+extern int
+HandleAliasDef(KeyAliasDef *def, unsigned merge, unsigned file_id,
+               AliasInfo **info);
+
+extern void
+ClearAliases(AliasInfo **info);
+
+extern Bool
+MergeAliases(AliasInfo **into, AliasInfo **merge, unsigned how_merge);
+
+extern int
+ApplyAliases(struct xkb_keymap *xkb, AliasInfo **info);
 
 #endif /* ALIAS_H */

diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index a38d29e..b39d8ce 100644 (file)
--- a/src/xkbcomp/compat.c
+++ b/src/xkbcomp/compat.c
@@ -388,11 +388,8 @@ MergeIncludedCompatMaps(CompatInfo * into, CompatInfo * from, unsigned merge)
     }
 }
 
-typedef void (*FileHandler) (XkbFile * /* rtrn */ ,
-                             struct xkb_keymap * /* xkb */ ,
-                             unsigned /* merge */ ,
-                             CompatInfo *       /* info */
-    );
+typedef void (*FileHandler) (XkbFile *rtrn, struct xkb_keymap *xkb,
+                             unsigned merge, CompatInfo *info);
 
 static Bool
 HandleIncludeCompatMap(IncludeStmt * stmt,

diff --git a/src/xkbcomp/expr.c b/src/xkbcomp/expr.c
index d147e89..048a348 100644 (file)
--- a/src/xkbcomp/expr.c
+++ b/src/xkbcomp/expr.c
@@ -35,11 +35,8 @@
 
 /***====================================================================***/
 
-typedef Bool(*IdentLookupFunc) (const void * /* priv */ ,
-                                xkb_atom_t /* field */ ,
-                                unsigned /* type */ ,
-                                ExprResult *    /* val_rtrn */
-    );
+typedef Bool (*IdentLookupFunc) (const void *priv, xkb_atom_t field,
+                                 unsigned type, ExprResult *val_rtrn);
 
 /***====================================================================***/
 

diff --git a/src/xkbcomp/expr.h b/src/xkbcomp/expr.h
index 7f15f90..02a2a93 100644 (file)
--- a/src/xkbcomp/expr.h
+++ b/src/xkbcomp/expr.h
@@ -35,11 +35,9 @@ typedef union _ExprResult
     struct xkb_key_name keyName;
 } ExprResult;
 
-extern int ExprResolveLhs(ExprDef * /* expr */ ,
-                          ExprResult * /* elem_rtrn */ ,
-                          ExprResult * /* field_rtrn */ ,
-                          ExprDef **    /* index_rtrn */
-    );
+extern int
+ExprResolveLhs(ExprDef *expr, ExprResult *elem_rtrn, ExprResult *field_rtrn,
+               ExprDef **index_rtrn);
 
 typedef struct _LookupEntry
 {
@@ -48,84 +46,63 @@ typedef struct _LookupEntry
 } LookupEntry;
 
 
-extern const char *exprOpText(unsigned        /* type */
-    );
-
-extern int LookupModMask(const void * /* priv */ ,
-                         xkb_atom_t /* field */ ,
-                         unsigned /* type */ ,
-                         ExprResult *  /* val_rtrn */
-    );
-
-extern int LookupVModMask(const void * /* priv */ ,
-                          xkb_atom_t /* field */ ,
-                          unsigned /* type */ ,
-                          ExprResult *  /* val_rtrn */
-    );
-
-extern int LookupModIndex(const void * /* priv */ ,
-                          xkb_atom_t /* field */ ,
-                          unsigned /* type */ ,
-                          ExprResult *  /* val_rtrn */
-    );
-
-extern int ExprResolveModMask(ExprDef * /* expr */ ,
-                              ExprResult * /* val_rtrn */
-    );
-
-extern int ExprResolveVModMask(ExprDef * /* expr */ ,
-                               ExprResult * /* val_rtrn */ ,
-                               struct xkb_keymap * /* xkb */
-    );
-
-extern int ExprResolveBoolean(ExprDef * /* expr */ ,
-                              ExprResult * /* val_rtrn */
-    );
-
-extern int ExprResolveKeyCode(ExprDef * /* expr */ ,
-                              ExprResult * /* val_rtrn */
-    );
-
-extern int ExprResolveInteger(ExprDef * /* expr */ ,
-                              ExprResult * /* val_rtrn */
-    );
-
-extern int ExprResolveLevel(ExprDef * /* expr */ ,
-                            ExprResult * /* val_rtrn */
-    );
-
-extern int ExprResolveGroup(ExprDef * /* expr */ ,
-                            ExprResult * /* val_rtrn */
-    );
-
-extern int ExprResolveButton(ExprDef * /* expr */ ,
-                             ExprResult * /* val_rtrn */
-    );
-
-extern int ExprResolveFloat(ExprDef * /* expr */ ,
-                            ExprResult * /* val_rtrn */
-    );
-
-extern int ExprResolveString(ExprDef * /* expr */ ,
-                             ExprResult * /* val_rtrn */
-    );
-
-extern int ExprResolveKeyName(ExprDef * /* expr */ ,
-                              ExprResult * /* val_rtrn */
-    );
-
-extern int ExprResolveEnum(ExprDef * /* expr */ ,
-                           ExprResult * /* val_rtrn */ ,
-                           const LookupEntry *  /* values */
-    );
-
-extern int ExprResolveMask(ExprDef * /* expr */ ,
-                           ExprResult * /* val_rtrn */ ,
-                           const LookupEntry * /* values */
-    );
-
-extern int ExprResolveKeySym(ExprDef * /* expr */ ,
-                             ExprResult * /* val_rtrn */
-    );
+extern const char *
+exprOpText(unsigned type);
+
+extern int
+LookupModMask(const void *priv, xkb_atom_t field, unsigned type,
+              ExprResult *val_rtrn);
+
+extern int
+LookupVModMask(const void *priv, xkb_atom_t field, unsigned type,
+               ExprResult *val_rtrn);
+
+extern int
+LookupModIndex(const void *priv, xkb_atom_t field, unsigned type,
+               ExprResult *val_rtrn);
+
+extern int
+ExprResolveModMask(ExprDef *expr, ExprResult *val_rtrn);
+
+extern int
+ExprResolveVModMask(ExprDef *expr, ExprResult *val_rtrn,
+                    struct xkb_keymap *xkb);
+
+extern int
+ExprResolveBoolean(ExprDef *expr, ExprResult *val_rtrn);
+
+extern int
+ExprResolveKeyCode(ExprDef *expr, ExprResult *val_rtrn);
+
+extern int
+ExprResolveInteger(ExprDef *expr, ExprResult *val_rtrn);
+
+extern int
+ExprResolveLevel(ExprDef *expr, ExprResult *val_rtrn);
+
+extern int
+ExprResolveGroup(ExprDef *expr, ExprResult *val_rtrn);
+
+extern int
+ExprResolveButton(ExprDef *expr, ExprResult *val_rtrn);
+
+extern int
+ExprResolveFloat(ExprDef *expr, ExprResult *val_rtrn);
+
+extern int
+ExprResolveString(ExprDef *expr, ExprResult *val_rtrn);
+
+extern int
+ExprResolveKeyName(ExprDef *expr, ExprResult *val_rtrn);
+
+extern int
+ExprResolveEnum(ExprDef *expr, ExprResult *val_rtrn,
+                const LookupEntry *values);
+
+extern int
+ExprResolveMask(ExprDef *expr, ExprResult *val_rtrn,
+                const LookupEntry *values);
+
+extern int ExprResolveKeySym(ExprDef *expr, ExprResult *val_rtrn);
 
 #endif /* EXPR_H */

diff --git a/src/xkbcomp/indicators.h b/src/xkbcomp/indicators.h
index 86e6295..f95f1a1 100644 (file)
--- a/src/xkbcomp/indicators.h
+++ b/src/xkbcomp/indicators.h
@@ -51,33 +51,27 @@ typedef struct _LEDInfo
     unsigned int ctrls;
 } LEDInfo;
 
-extern void ClearIndicatorMapInfo(LEDInfo *     /* info */
-    );
+extern void
+ClearIndicatorMapInfo(LEDInfo *info);
 
 
-extern LEDInfo *AddIndicatorMap(LEDInfo * /* oldLEDs */ ,
-                                LEDInfo *       /* newLED */
-    );
+extern LEDInfo *
+AddIndicatorMap(LEDInfo *oldLEDs, LEDInfo *newLED);
 
-extern int SetIndicatorMapField(LEDInfo * /* led */ ,
-                                struct xkb_keymap * /* xkb */ ,
-                                char * /* field */ ,
-                                ExprDef * /* arrayNdx */ ,
-                                ExprDef *       /* value */
-    );
+extern int
+SetIndicatorMapField(LEDInfo *led, struct xkb_keymap *xkb, char *field,
+                     ExprDef *arrayNdx, ExprDef *value);
 
-extern LEDInfo *HandleIndicatorMapDef(IndicatorMapDef * /* stmt */ ,
-                                      struct xkb_keymap * /* xkb */ ,
-                                      LEDInfo * /* dflt */ ,
-                                      LEDInfo * /* oldLEDs */ ,
-                                      unsigned  /* mergeMode */
-    );
+extern LEDInfo *
+HandleIndicatorMapDef(IndicatorMapDef *stmt, struct xkb_keymap *xkb,
+                      LEDInfo *dflt, LEDInfo *oldLEDs, unsigned mergeMode);
 
 extern Bool
-CopyIndicatorMapDefs(struct xkb_keymap * xkb, LEDInfo *leds, LEDInfo **unboundRtrn);
+CopyIndicatorMapDefs(struct xkb_keymap *xkb, LEDInfo *leds,
+                     LEDInfo **unboundRtrn);
 
 extern Bool
-BindIndicators(struct xkb_keymap * xkb, Bool force, LEDInfo *unbound,
+BindIndicators(struct xkb_keymap *xkb, Bool force, LEDInfo *unbound,
                LEDInfo **unboundRtrn);
 
 #endif /* INDICATORS_H */

diff --git a/src/xkbcomp/keycodes.h b/src/xkbcomp/keycodes.h
index c64b082..7f8b567 100644 (file)
--- a/src/xkbcomp/keycodes.h
+++ b/src/xkbcomp/keycodes.h
@@ -27,13 +27,16 @@
 #ifndef KEYCODES_H
 #define KEYCODES_H 1
 
-#define        KeyNameToLong(n)        ((((unsigned long)n[0])<<24)|(((unsigned long)n[1])<<16)|(((unsigned long)n[2])<<8)|n[3])
+#define KeyNameToLong(n) (              \
+    (((unsigned long)n[0]) << 24) |     \
+    (((unsigned long)n[1]) << 16) |     \
+    (((unsigned long)n[2]) << 8)  |     \
+    (((unsigned long)n[3]) << 0))
 
-extern const char *longText(unsigned long /* val */
-    );
+extern const
+char *longText(unsigned long val);
 
-extern void LongToKeyName(unsigned long /* val */ ,
-                          char *        /* name_rtrn */
-    );
+extern void
+LongToKeyName(unsigned long val, char *name_rtrn);
 
 #endif /* KEYCODES_H */

diff --git a/src/xkbcomp/keytypes.c b/src/xkbcomp/keytypes.c
index ddf174c..ae0c15a 100644 (file)
--- a/src/xkbcomp/keytypes.c
+++ b/src/xkbcomp/keytypes.c
@@ -356,11 +356,8 @@ MergeIncludedKeyTypes(KeyTypesInfo * into,
     into->stdPresent |= from->stdPresent;
 }
 
-typedef void (*FileHandler) (XkbFile * /* file */ ,
-                             struct xkb_keymap * /* xkb */ ,
-                             unsigned /* merge */ ,
-                             KeyTypesInfo *     /* included */
-    );
+typedef void (*FileHandler) (XkbFile *file, struct xkb_keymap *xkb,
+                             unsigned merge, KeyTypesInfo *included);
 
 static Bool
 HandleIncludeKeyTypes(IncludeStmt * stmt,

diff --git a/src/xkbcomp/misc.h b/src/xkbcomp/misc.h
index 01fb416..11753f0 100644 (file)
--- a/src/xkbcomp/misc.h
+++ b/src/xkbcomp/misc.h
@@ -35,58 +35,40 @@ typedef struct _CommonInfo
     struct _CommonInfo *next;
 } CommonInfo;
 
-extern Bool UseNewField(unsigned /* field */ ,
-                        CommonInfo * /* oldDefs */ ,
-                        CommonInfo * /* newDefs */ ,
-                        unsigned *      /* pCollide */
-    );
-
-extern char * ClearCommonInfo(CommonInfo *    /* cmn */
-    );
-
-extern char * AddCommonInfo(CommonInfo * /* old */ ,
-                              CommonInfo *      /* new */
-    );
-
-extern int ReportNotArray(const char * /* type */ ,
-                          const char * /* field */ ,
-                          const char *  /* name */
-    );
-
-extern int ReportShouldBeArray(const char * /* type */ ,
-                               const char * /* field */ ,
-                               const char *   /* name */
-    );
-
-extern int ReportBadType(const char * /* type */ ,
-                         const char * /* field */ ,
-                         const char * /* name */ ,
-                         const char *   /* wanted */
-    );
-
-extern int ReportBadField(const char * /* type */ ,
-                          const char * /* field */ ,
-                          const char *  /* name */
-    );
-
-extern Bool ProcessIncludeFile(struct xkb_context * /* context */,
-                               IncludeStmt * /* stmt */ ,
-                               unsigned /* file_type */ ,
-                               XkbFile ** /* file_rtrn */ ,
-                               unsigned *       /* merge_rtrn */
-    );
-
-extern Bool FindNamedKey(struct xkb_keymap * /* xkb */ ,
-                         unsigned long /* name */ ,
-                         xkb_keycode_t * /* kc_rtrn */ ,
-                         Bool /* use_aliases */ ,
-                         Bool /* create */ ,
-                         xkb_keycode_t    /* start_from */
-    );
-
-extern Bool FindKeyNameForAlias(struct xkb_keymap * /* xkb */ ,
-                                unsigned long /* lname */ ,
-                                unsigned long * /* real_name */
-    );
+extern Bool
+UseNewField(unsigned field, CommonInfo *oldDefs, CommonInfo *newDefs,
+            unsigned *pCollide);
+
+extern char *
+ClearCommonInfo(CommonInfo *cmn);
+
+extern char *
+AddCommonInfo(CommonInfo *old, CommonInfo *new);
+
+extern int
+ReportNotArray(const char *type, const char *field, const char *name);
+
+extern int
+ReportShouldBeArray(const char *type, const char *field, const char *name);
+
+extern int
+ReportBadType(const char *type, const char *field, const char *name,
+              const char *wanted);
+
+extern int
+ReportBadField(const char *type, const char *field, const char *name);
+
+extern Bool
+ProcessIncludeFile(struct xkb_context *context,
+                   IncludeStmt *stmt, unsigned file_type, XkbFile **file_rtrn,
+                   unsigned *merge_rtrn);
+
+extern Bool
+FindNamedKey(struct xkb_keymap *xkb, unsigned long name, xkb_keycode_t *kc_rtrn,
+             Bool use_aliases, Bool create, xkb_keycode_t start_from);
+
+extern Bool
+FindKeyNameForAlias(struct xkb_keymap *xkb, unsigned long lname,
+                    unsigned long *real_name);
 
 #endif /* MISC_H */

diff --git a/src/xkbcomp/parseutils.h b/src/xkbcomp/parseutils.h
index 82cd0fc..87b1620 100644 (file)
--- a/src/xkbcomp/parseutils.h
+++ b/src/xkbcomp/parseutils.h
@@ -41,131 +41,102 @@ struct scanner_extra {
     char *s;
 };
 
-extern ParseCommon *AppendStmt(ParseCommon * /* to */ ,
-                               ParseCommon *    /* append */
-    );
+extern ParseCommon *
+AppendStmt(ParseCommon *to, ParseCommon *append);
 
-extern ExprDef *ExprCreate(unsigned /* op */ ,
-                           unsigned     /* type */
-    );
+extern ExprDef *
+ExprCreate(unsigned op, unsigned type);
 
-extern ExprDef *ExprCreateUnary(unsigned /* op */ ,
-                                unsigned /* type */ ,
-                                ExprDef *       /* child */
-    );
+extern ExprDef *
+ExprCreateUnary(unsigned op, unsigned type, ExprDef *child);
 
-extern ExprDef *ExprCreateBinary(unsigned /* op */ ,
-                                 ExprDef * /* left */ ,
-                                 ExprDef *      /* right */
-    );
+extern ExprDef *
+ExprCreateBinary(unsigned op, ExprDef *left, ExprDef *right);
 
-extern KeycodeDef *KeycodeCreate(const char * /* name */ ,
-                                 unsigned long /* value */
-    );
+extern KeycodeDef *
+KeycodeCreate(const char *name, unsigned long value);
 
-extern KeyAliasDef *KeyAliasCreate(const char * /* alias */ ,
-                                   const char * /* real */
-    );
+extern KeyAliasDef *
+KeyAliasCreate(const char *alias, const char *real);
 
-extern VModDef *VModCreate(xkb_atom_t /* name */ ,
-                           ExprDef *    /* value */
-    );
+extern VModDef *
+VModCreate(xkb_atom_t name, ExprDef *value);
 
-extern VarDef *VarCreate(ExprDef * /* name */ ,
-                         ExprDef *      /* value */
-    );
+extern VarDef *
+VarCreate(ExprDef *name, ExprDef *value);
 
-extern VarDef *BoolVarCreate(xkb_atom_t /* nameToken */ ,
-                             unsigned   /* set */
-    );
+extern VarDef *
+BoolVarCreate(xkb_atom_t nameToken, unsigned set);
 
-extern InterpDef *InterpCreate(char * /* sym */ ,
-                               ExprDef *        /* match */
-    );
+extern InterpDef *
+InterpCreate(char *sym, ExprDef *match);
 
-extern KeyTypeDef *KeyTypeCreate(xkb_atom_t /* name */ ,
-                                 VarDef *       /* body */
-    );
+extern KeyTypeDef *
+KeyTypeCreate(xkb_atom_t name, VarDef *body);
 
-extern SymbolsDef *SymbolsCreate(const char * /* keyName */ ,
-                                 ExprDef *      /* symbols */
-    );
+extern SymbolsDef *
+SymbolsCreate(const char *keyName, ExprDef *symbols);
 
-extern GroupCompatDef *GroupCompatCreate(int /* group */ ,
-                                         ExprDef *      /* def */
-    );
+extern GroupCompatDef *
+GroupCompatCreate(int group, ExprDef *def);
 
-extern ModMapDef *ModMapCreate(uint32_t /* modifier */ ,
-                               ExprDef *        /* keys */
-    );
+extern ModMapDef *
+ModMapCreate(uint32_t modifier, ExprDef *keys);
 
-extern IndicatorMapDef *IndicatorMapCreate(xkb_atom_t /* name */ ,
-                                           VarDef *     /* body */
-    );
+extern IndicatorMapDef *
+IndicatorMapCreate(xkb_atom_t name, VarDef *body);
 
-extern IndicatorNameDef *IndicatorNameCreate(int /* ndx */ ,
-                                             ExprDef * /* name */ ,
-                                             Bool       /* virtual */
-    );
+extern IndicatorNameDef *
+IndicatorNameCreate(int ndx, ExprDef *name, Bool virtual);
 
-extern ExprDef *ActionCreate(xkb_atom_t /* name */ ,
-                             ExprDef *  /* args */
-    );
+extern ExprDef *
+ActionCreate(xkb_atom_t name, ExprDef *args);
 
-extern ExprDef *CreateMultiKeysymList(ExprDef * /* list */
-    );
+extern ExprDef *
+CreateMultiKeysymList(ExprDef *list);
 
-extern ExprDef *CreateKeysymList(char * /* sym */
-    );
+extern ExprDef *
+CreateKeysymList(char *sym);
 
-extern ExprDef *AppendMultiKeysymList(ExprDef * /* list */ ,
-                                      ExprDef * /* append */
-    );
+extern ExprDef *
+AppendMultiKeysymList(ExprDef *list, ExprDef *append);
 
-extern ExprDef *AppendKeysymList(ExprDef * /* list */ ,
-                                 char * /* sym */
-    );
+extern ExprDef *
+AppendKeysymList(ExprDef *list, char *sym);
 
-extern int LookupKeysym(const char * /* str */ ,
-                        xkb_keysym_t *        /* sym_rtrn */
-    );
+extern int
+LookupKeysym(const char *str, xkb_keysym_t *sym_rtrn);
 
-extern IncludeStmt *IncludeCreate(char * /* str */ ,
-                                  unsigned      /* merge */
-    );
+extern IncludeStmt *
+IncludeCreate(char *str, unsigned merge);
 
-extern unsigned StmtSetMerge(ParseCommon * /* stmt */ ,
-                             unsigned   /* merge */,
-                             YYLTYPE *  /* loc */,
-                             void *     /* scanner */
-    );
+extern unsigned
+StmtSetMerge(ParseCommon *stmt, unsigned merge, YYLTYPE *loc, void *scanner);
 
 #ifdef DEBUG
-extern void PrintStmtAddrs(ParseCommon *        /* stmt */
-    );
+extern void
+PrintStmtAddrs(ParseCommon *stmt);
 #endif
 
-extern int XKBParseFile(FILE * /* file */ ,
-                        const char *    /* fileName */,
-                        XkbFile **      /* pRtrn */
-    );
+extern void
+CheckDefaultMap(XkbFile *maps, const char *fileName);
 
-extern int XKBParseString(const char *string, const char *fileName,
-                          XkbFile ** pRtrn);
+extern int
+XKBParseFile(FILE *file, const char *fileName, XkbFile **pRtrn);
 
-extern void CheckDefaultMap(XkbFile * maps, const char *fileName);
+extern int
+XKBParseString(const char *string, const char *fileName, XkbFile **pRtrn);
 
-extern XkbFile *CreateXKBFile(int /* type */ ,
-                              char * /* name */ ,
-                              ParseCommon * /* defs */ ,
-                              unsigned  /* flags */
-    );
+extern XkbFile *
+CreateXKBFile(int type, char *name, ParseCommon *defs, unsigned flags);
 
-extern void FreeXKBFile(XkbFile *file);
+extern void
+FreeXKBFile(XkbFile *file);
 
-extern void FreeStmt(ParseCommon * /* stmt */
-    );
+extern void
+FreeStmt(ParseCommon *stmt);
 
-extern void yyerror(struct YYLTYPE *loc, void *scanner, const char *msg);
+extern void
+yyerror(struct YYLTYPE *loc, void *scanner, const char *msg);
 
 #endif /* XKBPARSE_H */

diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c
index 8762720..ea4b092 100644 (file)
--- a/src/xkbcomp/symbols.c
+++ b/src/xkbcomp/symbols.c
@@ -876,11 +876,8 @@ MergeIncludedSymbols(SymbolsInfo * into, SymbolsInfo * from,
         into->errorCount++;
 }
 
-typedef void (*FileHandler) (XkbFile * /* rtrn */ ,
-                             struct xkb_keymap * /* xkb */ ,
-                             unsigned /* merge */ ,
-                             SymbolsInfo *      /* included */
-    );
+typedef void (*FileHandler) (XkbFile *rtrn, struct xkb_keymap *xkb,
+                             unsigned merge, SymbolsInfo *included);
 
 static Bool
 HandleIncludeSymbols(IncludeStmt * stmt,

diff --git a/src/xkbcomp/vmod.h b/src/xkbcomp/vmod.h
index d89c680..9463f6d 100644 (file)
--- a/src/xkbcomp/vmod.h
+++ b/src/xkbcomp/vmod.h
@@ -29,38 +29,31 @@
 
 typedef struct _VModInfo
 {
-    struct xkb_keymap * xkb;
+    struct xkb_keymap *xkb;
     unsigned defined;
     unsigned available;
     unsigned newlyDefined;
     int errorCount;
 } VModInfo;
 
-extern void InitVModInfo(VModInfo * /* info */ ,
-                         struct xkb_keymap *     /* xkb */
-    );
+extern void
+InitVModInfo(VModInfo *info, struct xkb_keymap *xkb);
 
-extern void ClearVModInfo(VModInfo * /* info */ ,
-                          struct xkb_keymap *    /* xkb */
-    );
+extern void
+ClearVModInfo(VModInfo *info, struct xkb_keymap *xkb);
 
-extern Bool HandleVModDef(VModDef * /* stmt */ ,
-                          struct xkb_keymap * /* xkb */ ,
-                          unsigned /* mergeMode */ ,
-                          VModInfo *    /* info */
-    );
+extern Bool
+HandleVModDef(VModDef *stmt, struct xkb_keymap *xkb, unsigned mergeMode,
+              VModInfo *info);
 
-extern Bool ApplyVModDefs(VModInfo * /* info */ ,
-                          struct xkb_keymap *    /* xkb */
-    );
+extern Bool
+ApplyVModDefs(VModInfo *info, struct xkb_keymap *xkb);
 
-extern int FindKeypadVMod(struct xkb_keymap *    /* xkb */
-    );
+extern int
+FindKeypadVMod(struct xkb_keymap *xkb);
 
-extern Bool ResolveVirtualModifier(ExprDef * /* def */ ,
-                                   struct xkb_keymap * /* xkb */ ,
-                                   ExprResult * /* value_rtrn */ ,
-                                   VModInfo *   /* info */
-    );
+extern Bool
+ResolveVirtualModifier(ExprDef *def, struct xkb_keymap *xkb,
+                       ExprResult *value_rtrn, VModInfo *info);
 
 #endif /* VMOD_H */

diff --git a/src/xkbcomp/xkbpath.h b/src/xkbcomp/xkbpath.h
index e48cf41..8fe5571 100644 (file)
--- a/src/xkbcomp/xkbpath.h
+++ b/src/xkbcomp/xkbpath.h
@@ -31,20 +31,15 @@
 
 #include "XKBcommonint.h"
 
-extern const char *XkbDirectoryForInclude(unsigned    /* type */
-    );
-
-extern FILE *XkbFindFileInPath(struct xkb_context * /* context */,
-                               const char * /* name */ ,
-                               unsigned /* type */ ,
-                               char **  /* pathRtrn */
-    );
-
-extern Bool XkbParseIncludeMap(char ** /* str_inout */ ,
-                               char ** /* file_rtrn */ ,
-                               char ** /* map_rtrn */ ,
-                               char * /* nextop_rtrn */ ,
-                               char **  /* extra_data */
-    );
+extern const char *
+XkbDirectoryForInclude(unsigned type);
+
+extern FILE *
+XkbFindFileInPath(struct xkb_context *context, const char *name,
+                  unsigned type, char **pathRtrn);
+
+extern Bool
+XkbParseIncludeMap(char **str_inout, char **file_rtrn, char **map_rtrn,
+                   char *nextop_rtrn, char **extra_data);
 
 #endif /* _XKBPATH_H_ */