Omit struct '_Name' from non-recursive struct typedefs

Just a pet peeve.

Signed-off-by: Ran Benita <ran234@gmail.com>

diff --git a/src/xkbcomp/ast.h b/src/xkbcomp/ast.h
index 425e502..1e267ed 100644 (file)
--- a/src/xkbcomp/ast.h
+++ b/src/xkbcomp/ast.h
@@ -193,63 +193,63 @@ typedef struct _Expr {
     } value;
 } ExprDef;
 
-typedef struct _VarDef {
+typedef struct {
     ParseCommon common;
     enum merge_mode merge;
     ExprDef *name;
     ExprDef *value;
 } VarDef;
 
-typedef struct _VModDef {
+typedef struct {
     ParseCommon common;
     enum merge_mode merge;
     xkb_atom_t name;
     ExprDef *value;
 } VModDef;
 
-typedef struct _KeycodeDef {
+typedef struct {
     ParseCommon common;
     enum merge_mode merge;
     xkb_atom_t name;
     int64_t value;
 } KeycodeDef;
 
-typedef struct _KeyAliasDef {
+typedef struct {
     ParseCommon common;
     enum merge_mode merge;
     xkb_atom_t alias;
     xkb_atom_t real;
 } KeyAliasDef;
 
-typedef struct _KeyTypeDef {
+typedef struct {
     ParseCommon common;
     enum merge_mode merge;
     xkb_atom_t name;
     VarDef *body;
 } KeyTypeDef;
 
-typedef struct _SymbolsDef {
+typedef struct {
     ParseCommon common;
     enum merge_mode merge;
     xkb_atom_t keyName;
     ExprDef *symbols;
 } SymbolsDef;
 
-typedef struct _ModMapDef {
+typedef struct {
     ParseCommon common;
     enum merge_mode merge;
     xkb_atom_t modifier;
     ExprDef *keys;
 } ModMapDef;
 
-typedef struct _GroupCompatDef {
+typedef struct {
     ParseCommon common;
     enum merge_mode merge;
     int group;
     ExprDef *def;
 } GroupCompatDef;
 
-typedef struct _InterpDef {
+typedef struct {
     ParseCommon common;
     enum merge_mode merge;
     char *sym;
@@ -257,7 +257,7 @@ typedef struct _InterpDef {
     VarDef *def;
 } InterpDef;
 
-typedef struct _IndicatorNameDef {
+typedef struct {
     ParseCommon common;
     enum merge_mode merge;
     int ndx;
@@ -265,7 +265,7 @@ typedef struct _IndicatorNameDef {
     bool virtual;
 } IndicatorNameDef;
 
-typedef struct _IndicatorMapDef {
+typedef struct {
     ParseCommon common;
     enum merge_mode merge;
     xkb_atom_t name;
@@ -283,7 +283,7 @@ enum xkb_map_flags {
     MAP_IS_ALTGR = (1 << 7),
 };
 
-typedef struct _XkbFile {
+typedef struct {
     ParseCommon common;
     enum xkb_file_type file_type;
     char *topName;

diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index c317267..8e15f12 100644 (file)
--- a/src/xkbcomp/compat.c
+++ b/src/xkbcomp/compat.c
@@ -165,7 +165,7 @@ enum si_field {
     SI_FIELD_LEVEL_ONE_ONLY = (1 << 3),
 };
 
-typedef struct _SymInterpInfo {
+typedef struct {
     enum si_field defined;
     unsigned file_id;
     enum merge_mode merge;
@@ -179,7 +179,7 @@ enum led_field {
     LED_FIELD_CTRLS      = (1 << 2),
 };
 
-typedef struct _LEDInfo {
+typedef struct {
     enum led_field defined;
     unsigned file_id;
     enum merge_mode merge;
@@ -187,7 +187,7 @@ typedef struct _LEDInfo {
     struct xkb_indicator_map im;
 } LEDInfo;
 
-typedef struct _CompatInfo {
+typedef struct {
     char *name;
     unsigned file_id;
     int errorCount;

diff --git a/src/xkbcomp/keycodes.c b/src/xkbcomp/keycodes.c
index 4273ebe..544a4c8 100644 (file)
--- a/src/xkbcomp/keycodes.c
+++ b/src/xkbcomp/keycodes.c
@@ -103,7 +103,7 @@
  * contain any useful information besides the key name at this point.
  */
 
-typedef struct _AliasInfo {
+typedef struct {
     enum merge_mode merge;
     unsigned file_id;
 
@@ -116,14 +116,14 @@ typedef struct {
     xkb_atom_t name;
 } KeyNameInfo;
 
-typedef struct _IndicatorNameInfo {
+typedef struct {
     enum merge_mode merge;
     unsigned file_id;
 
     xkb_atom_t name;
 } IndicatorNameInfo;
 
-typedef struct _KeyNamesInfo {
+typedef struct {
     char *name;     /* e.g. evdev+aliases(qwerty) */
     int errorCount;
     unsigned file_id;

diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c
index 95fbd57..8c1abc8 100644 (file)
--- a/src/xkbcomp/symbols.c
+++ b/src/xkbcomp/symbols.c
@@ -85,7 +85,7 @@ typedef struct {
     xkb_atom_t type;
 } GroupInfo;
 
-typedef struct _KeyInfo {
+typedef struct {
     enum key_field defined;
     unsigned file_id;
     enum merge_mode merge;
@@ -161,7 +161,7 @@ ClearKeyInfo(KeyInfo *keyi)
 
 /***====================================================================***/
 
-typedef struct _ModMapEntry {
+typedef struct {
     enum merge_mode merge;
     bool haveSymbol;
     xkb_mod_index_t modifier;
@@ -171,7 +171,7 @@ typedef struct _ModMapEntry {
     } u;
 } ModMapEntry;
 
-typedef struct _SymbolsInfo {
+typedef struct {
     char *name;         /* e.g. pc+us+inet(evdev) */
     int errorCount;
     unsigned file_id;

diff --git a/src/xkbcomp/types.c b/src/xkbcomp/types.c
index ada9a1f..ca73272 100644 (file)
--- a/src/xkbcomp/types.c
+++ b/src/xkbcomp/types.c
@@ -142,7 +142,7 @@ enum type_field {
     TYPE_FIELD_LEVEL_NAME = (1 << 3),
 };
 
-typedef struct _KeyTypeInfo {
+typedef struct {
     enum type_field defined;
     unsigned file_id;
     enum merge_mode merge;
@@ -154,7 +154,7 @@ typedef struct _KeyTypeInfo {
     darray(xkb_atom_t) level_names;
 } KeyTypeInfo;
 
-typedef struct _KeyTypesInfo {
+typedef struct {
     char *name;
     int errorCount;
     unsigned file_id;

diff --git a/src/xkbcomp/vmod.h b/src/xkbcomp/vmod.h
index 96b330d..a53a14b 100644 (file)
--- a/src/xkbcomp/vmod.h
+++ b/src/xkbcomp/vmod.h
@@ -27,7 +27,7 @@
 #ifndef XKBCOMP_VMOD_H
 #define XKBCOMP_VMOD_H
 
-typedef struct _VModInfo {
+typedef struct {
     xkb_mod_mask_t defined;
     xkb_mod_mask_t available;
 } VModInfo;