Fix #8: No more possible POSIX reserved type names

florentc · florentc · commit 7cab0414cd83 · 2018-08-23T13:31:09.000+02:00
diff --git a/src/conf.c b/src/conf.c
@@ -23,7 +23,7 @@
 #include <string.h>
 
 static int config_setting_lookup_dim(const config_setting_t *setting,
-                                     const char *name, dim_t *value)
+                                     const char *name, Dim *value)
 {
     double rel;
     int abs;
@@ -99,7 +99,7 @@ static int config_setting_lookup_color(const config_setting_t *setting,
 }
 
 static int config_setting_lookup_colorspec(const config_setting_t *setting,
-                                           const char *name, colorspec_t *value)
+                                           const char *name, Colorspec *value)
 {
     config_setting_t *colorspec_setting;
     int success_status = CONFIG_FALSE;
@@ -119,7 +119,7 @@ static int config_setting_lookup_colorspec(const config_setting_t *setting,
 
 static int config_setting_lookup_overflowmode(const config_setting_t *setting,
                                               const char *name,
-                                              overflow_mode_t *value)
+                                              Overflow_mode *value)
 {
     const char *stringvalue;
     int success_status = CONFIG_FALSE;
@@ -148,14 +148,13 @@ static int config_setting_lookup_overflowmode(const config_setting_t *setting,
     return success_status;
 }
 
-style_t parse_style_config(FILE *file, const char *stylename,
-                           style_t default_style)
+Style parse_style_config(FILE *file, const char *stylename, Style default_style)
 {
     config_t config;
     config_setting_t *style_config;
     config_setting_t *color_config;
     config_init(&config);
-    style_t style = default_style;
+    Style style = default_style;
 
     if (config_read(&config, file))
     {
diff --git a/src/conf.h b/src/conf.h
@@ -25,41 +25,41 @@ typedef struct
     const char *fg;
     const char *bg;
     const char *border;
-} colorspec_t;
+} Colorspec;
 
 typedef struct
 {
     double rel;
     int abs;
-} dim_t;
+} Dim;
 
 typedef enum
 {
     HIDDEN,
     PROPORTIONAL
-} overflow_mode_t;
+} Overflow_mode;
 
 typedef struct
 {
-    dim_t x;
-    dim_t y;
-    dim_t length;
+    Dim x;
+    Dim y;
+    Dim length;
     int thickness;
     int border;
     int padding;
     int outline;
-    overflow_mode_t overflow;
+    Overflow_mode overflow;
     struct
     {
-        colorspec_t normal;
-        colorspec_t overflow;
-        colorspec_t alt;
-        colorspec_t altoverflow;
+        Colorspec normal;
+        Colorspec overflow;
+        Colorspec alt;
+        Colorspec altoverflow;
     } color;
-} style_t;
+} Style;
 
 /* clang-format off */
-#define DEFAULT_CONFIGURATION (style_t) {\
+#define DEFAULT_CONFIGURATION (Style) {\
         .x =\
         {\
             .rel = 0.5,\
@@ -114,7 +114,7 @@ typedef struct
 #define DEFAULT_CONFIG_APPNAME "xob"
 #define DEFAULT_CONFIG_FILENAME "styles.cfg"
 
-style_t parse_style_config(FILE *filename, const char *stylename,
-                           style_t default_style);
+Style parse_style_config(FILE *filename, const char *stylename,
+                         Style default_style);
 
 #endif /* __CONF_H__ */
diff --git a/src/display.c b/src/display.c
@@ -29,7 +29,7 @@ static int fit_in(int value, int min, int max)
 
 /* Get graphic context from a hex color specification string */
 /* NULL is returned in case of a parse error. */
-static GC gc_from_string(x_context_t x, const char *hexcolorstring)
+static GC gc_from_string(X_context x, const char *hexcolorstring)
 {
     XColor color;
     GC gc = XCreateGC(x.display, x.window, 0, NULL);
@@ -47,7 +47,7 @@ static GC gc_from_string(x_context_t x, const char *hexcolorstring)
 }
 
 /* Draw an empty bar with the given border color */
-static void draw_empty(x_context_t x, geometry_context_t g, gc_colorset_t color)
+static void draw_empty(X_context x, Geometry_context g, Gc_colorset color)
 {
     /* Outline */
     XFillRectangle(x.display, x.window, color.bg, 0, 0,
@@ -64,14 +64,13 @@ static void draw_empty(x_context_t x, geometry_context_t g, gc_colorset_t color)
 }
 
 /* Draw a given length of filled bar with the given color */
-static void draw_content(x_context_t x, geometry_context_t g, int length,
-                         GC color)
+static void draw_content(X_context x, Geometry_context g, int length, GC color)
 {
     XFillRectangle(x.display, x.window, color, g.outline + g.border + g.padding,
                    g.outline + g.border + g.padding, length, g.height);
 }
 /* Draw a separator (padding-sized gap) at the given position */
-static void draw_separator(x_context_t x, geometry_context_t g, int position,
+static void draw_separator(X_context x, Geometry_context g, int position,
                            GC color)
 {
     XFillRectangle(x.display, x.window, color,
@@ -82,9 +81,9 @@ static void draw_separator(x_context_t x, geometry_context_t g, int position,
 /* PUBLIC Returns a new display context from a given configuration. If the
  * .x.display field of the returned display context is NULL, display could not
  * have been opened.*/
-display_context_t init(style_t conf)
+Display_context init(Style conf)
 {
-    display_context_t dc;
+    Display_context dc;
     Window root;
     XSetWindowAttributes window_attributes;
     int topleft_x;
@@ -171,13 +170,13 @@ display_context_t init(style_t conf)
 }
 
 /* PUBLIC Show a bar filled at value/cap in normal or alternative mode */
-display_context_t show(display_context_t dc, int value, int cap,
-                       overflow_mode_t overflow_mode, show_mode_t show_mode)
+Display_context show(Display_context dc, int value, int cap,
+                     Overflow_mode overflow_mode, Show_mode show_mode)
 {
-    display_context_t newdc = dc;
+    Display_context newdc = dc;
 
-    gc_colorset_t colorset;
-    gc_colorset_t colorset_overflow_proportional;
+    Gc_colorset colorset;
+    Gc_colorset colorset_overflow_proportional;
 
     if (!dc.x.mapped)
     {
@@ -228,9 +227,9 @@ display_context_t show(display_context_t dc, int value, int cap,
 }
 
 /* PUBLIC Hide the window */
-display_context_t hide(display_context_t dc)
+Display_context hide(Display_context dc)
 {
-    display_context_t newdc = dc;
+    Display_context newdc = dc;
 
     if (dc.x.mapped)
     {
diff --git a/src/display.h b/src/display.h
@@ -26,7 +26,7 @@ typedef enum
 {
     NORMAL,
     ALTERNATIVE
-} show_mode_t;
+} Show_mode;
 
 typedef struct
 {
@@ -35,22 +35,22 @@ typedef struct
     Screen *screen;
     Window window;
     Bool mapped;
-} x_context_t;
+} X_context;
 
 typedef struct
 {
     GC fg;
     GC bg;
     GC border;
-} gc_colorset_t;
+} Gc_colorset;
 
 typedef struct
 {
-    gc_colorset_t normal;
-    gc_colorset_t overflow;
-    gc_colorset_t alt;
-    gc_colorset_t altoverflow;
-} color_context_t;
+    Gc_colorset normal;
+    Gc_colorset overflow;
+    Gc_colorset alt;
+    Gc_colorset altoverflow;
+} Color_context;
 
 typedef struct
 {
@@ -59,18 +59,18 @@ typedef struct
     int padding;
     int width;
     int height;
-} geometry_context_t;
+} Geometry_context;
 
 typedef struct
 {
-    x_context_t x;
-    color_context_t color;
-    geometry_context_t geometry;
-} display_context_t;
+    X_context x;
+    Color_context color;
+    Geometry_context geometry;
+} Display_context;
 
-display_context_t init(style_t conf);
-display_context_t show(display_context_t dc, int value, int cap,
-                       overflow_mode_t overflow_mode, show_mode_t show_mode);
-display_context_t hide(display_context_t dc);
+Display_context init(Style conf);
+Display_context show(Display_context dc, int value, int cap,
+                     Overflow_mode overflow_mode, Show_mode show_mode);
+Display_context hide(Display_context dc);
 
 #endif /* __DISPLAY_H__ */
diff --git a/src/main.c b/src/main.c
@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
 
     /* Style */
     FILE *config_file = NULL;
-    style_t style = DEFAULT_CONFIGURATION;
+    Style style = DEFAULT_CONFIGURATION;
     char xdg_config_file_path[PATH_MAX];
     char real_config_file_path[PATH_MAX];
 
@@ -169,8 +169,8 @@ int main(int argc, char *argv[])
     /* Display */
     bool displayed = false;
     bool listening = true;
-    input_value_t input_value;
-    display_context_t display_context = init(style);
+    Input_Value input_value;
+    Display_context display_context = init(style);
 
     if (display_context.x.display == NULL)
     {
@@ -228,9 +228,9 @@ int main(int argc, char *argv[])
     return EXIT_SUCCESS;
 }
 
-input_value_t parse_input(void)
+Input_Value parse_input(void)
 {
-    input_value_t input_value;
+    Input_Value input_value;
     char altflag;
 
     input_value.valid = false;
diff --git a/src/main.h b/src/main.h
@@ -27,9 +27,9 @@ typedef struct
 {
     bool valid;
     int value;
-    show_mode_t show_mode;
-} input_value_t;
+    Show_mode show_mode;
+} Input_Value;
 
-input_value_t parse_input(void);
+Input_Value parse_input(void);
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`#include <string.h>`
`24`	`24`
`25`	`25`	`static int config_setting_lookup_dim(const config_setting_t *setting,`
`26`		`- const char name, dim_t value)`
	`26`	`+ const char name, Dim value)`
`27`	`27`	`{`
`28`	`28`	`double rel;`
`29`	`29`	`int abs;`
`@@ -99,7 +99,7 @@ static int config_setting_lookup_color(const config_setting_t *setting,`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`static int config_setting_lookup_colorspec(const config_setting_t *setting,`
`102`		`- const char name, colorspec_t value)`
	`102`	`+ const char name, Colorspec value)`
`103`	`103`	`{`
`104`	`104`	`config_setting_t *colorspec_setting;`
`105`	`105`	`int success_status = CONFIG_FALSE;`
`@@ -119,7 +119,7 @@ static int config_setting_lookup_colorspec(const config_setting_t *setting,`
`119`	`119`
`120`	`120`	`static int config_setting_lookup_overflowmode(const config_setting_t *setting,`
`121`	`121`	`const char *name,`
`122`		`- overflow_mode_t *value)`
	`122`	`+ Overflow_mode *value)`
`123`	`123`	`{`
`124`	`124`	`const char *stringvalue;`
`125`	`125`	`int success_status = CONFIG_FALSE;`
`@@ -148,14 +148,13 @@ static int config_setting_lookup_overflowmode(const config_setting_t *setting,`
`148`	`148`	`return success_status;`
`149`	`149`	`}`
`150`	`150`
`151`		`-style_t parse_style_config(FILE file, const char stylename,`
`152`		`- style_t default_style)`
	`151`	`+Style parse_style_config(FILE file, const char stylename, Style default_style)`
`153`	`152`	`{`
`154`	`153`	`config_t config;`
`155`	`154`	`config_setting_t *style_config;`
`156`	`155`	`config_setting_t *color_config;`
`157`	`156`	`config_init(&config);`
`158`		`- style_t style = default_style;`
	`157`	`+ Style style = default_style;`
`159`	`158`
`160`	`159`	`if (config_read(&config, file))`
`161`	`160`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ static int fit_in(int value, int min, int max)`
`29`	`29`
`30`	`30`	`/* Get graphic context from a hex color specification string */`
`31`	`31`	`/* NULL is returned in case of a parse error. */`
`32`		`-static GC gc_from_string(x_context_t x, const char *hexcolorstring)`
	`32`	`+static GC gc_from_string(X_context x, const char *hexcolorstring)`
`33`	`33`	`{`
`34`	`34`	`XColor color;`
`35`	`35`	`GC gc = XCreateGC(x.display, x.window, 0, NULL);`
`@@ -47,7 +47,7 @@ static GC gc_from_string(x_context_t x, const char *hexcolorstring)`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/* Draw an empty bar with the given border color */`
`50`		`-static void draw_empty(x_context_t x, geometry_context_t g, gc_colorset_t color)`
	`50`	`+static void draw_empty(X_context x, Geometry_context g, Gc_colorset color)`
`51`	`51`	`{`
`52`	`52`	`/* Outline */`
`53`	`53`	`XFillRectangle(x.display, x.window, color.bg, 0, 0,`
`@@ -64,14 +64,13 @@ static void draw_empty(x_context_t x, geometry_context_t g, gc_colorset_t color)`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`/* Draw a given length of filled bar with the given color */`
`67`		`-static void draw_content(x_context_t x, geometry_context_t g, int length,`
`68`		`- GC color)`
	`67`	`+static void draw_content(X_context x, Geometry_context g, int length, GC color)`
`69`	`68`	`{`
`70`	`69`	`XFillRectangle(x.display, x.window, color, g.outline + g.border + g.padding,`
`71`	`70`	`g.outline + g.border + g.padding, length, g.height);`
`72`	`71`	`}`
`73`	`72`	`/* Draw a separator (padding-sized gap) at the given position */`
`74`		`-static void draw_separator(x_context_t x, geometry_context_t g, int position,`
	`73`	`+static void draw_separator(X_context x, Geometry_context g, int position,`
`75`	`74`	`GC color)`
`76`	`75`	`{`
`77`	`76`	`XFillRectangle(x.display, x.window, color,`
`@@ -82,9 +81,9 @@ static void draw_separator(x_context_t x, geometry_context_t g, int position,`
`82`	`81`	`/* PUBLIC Returns a new display context from a given configuration. If the`
`83`	`82`	`* .x.display field of the returned display context is NULL, display could not`
`84`	`83`	`* have been opened.*/`
`85`		`-display_context_t init(style_t conf)`
	`84`	`+Display_context init(Style conf)`
`86`	`85`	`{`
`87`		`- display_context_t dc;`
	`86`	`+ Display_context dc;`
`88`	`87`	`Window root;`
`89`	`88`	`XSetWindowAttributes window_attributes;`
`90`	`89`	`int topleft_x;`
`@@ -171,13 +170,13 @@ display_context_t init(style_t conf)`
`171`	`170`	`}`
`172`	`171`
`173`	`172`	`/* PUBLIC Show a bar filled at value/cap in normal or alternative mode */`
`174`		`-display_context_t show(display_context_t dc, int value, int cap,`
`175`		`- overflow_mode_t overflow_mode, show_mode_t show_mode)`
	`173`	`+Display_context show(Display_context dc, int value, int cap,`
	`174`	`+ Overflow_mode overflow_mode, Show_mode show_mode)`
`176`	`175`	`{`
`177`		`- display_context_t newdc = dc;`
	`176`	`+ Display_context newdc = dc;`
`178`	`177`
`179`		`- gc_colorset_t colorset;`
`180`		`- gc_colorset_t colorset_overflow_proportional;`
	`178`	`+ Gc_colorset colorset;`
	`179`	`+ Gc_colorset colorset_overflow_proportional;`
`181`	`180`
`182`	`181`	`if (!dc.x.mapped)`
`183`	`182`	`{`
`@@ -228,9 +227,9 @@ display_context_t show(display_context_t dc, int value, int cap,`
`228`	`227`	`}`
`229`	`228`
`230`	`229`	`/* PUBLIC Hide the window */`
`231`		`-display_context_t hide(display_context_t dc)`
	`230`	`+Display_context hide(Display_context dc)`
`232`	`231`	`{`
`233`		`- display_context_t newdc = dc;`
	`232`	`+ Display_context newdc = dc;`
`234`	`233`
`235`	`234`	`if (dc.x.mapped)`
`236`	`235`	`{`