Fix coding style, mostly whitespace

diff --git a/include/config/libinput.h b/include/config/libinput.h
index e46610c644c89a66d45d07b4f7429dcfac36759d..248c8d64598007043b98b65458e2548b30b5b73a 100644 (file)
--- a/include/config/libinput.h
+++ b/include/config/libinput.h
@@ -25,6 +25,6 @@ struct libinput_category {
 };
 
 enum device_type get_device_type(const char *s);
-struct libinput_category *libinput_category_create();
+struct libinput_category *libinput_category_create(void);
 
 #endif /* __LABWC_LIBINPUT_H */

diff --git a/src/config/libinput.c b/src/config/libinput.c
index e8ce4cfda5b4ddcf4d014a5c2efea7a0199317fd..119e68d38da8cd016626dc51684656e7877048b3 100644 (file)
--- a/src/config/libinput.c
+++ b/src/config/libinput.c
@@ -33,7 +33,7 @@ get_device_type(const char *s)
 }
 
 struct libinput_category *
-libinput_category_create()
+libinput_category_create(void)
 {
        struct libinput_category *l = calloc(1, sizeof(struct libinput_category));
        if (!l) {

diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index ed59b8de2de038dc144936a3d7e8055c3314705f..df8e1c49fa1c644dd5a2ba3921139c4018639b16 100644 (file)
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -150,15 +150,15 @@ fill_libinput_category(char *nodename, char *content)
        string_truncate_at_pattern(nodename, ".device.libinput");
 
        if (!strcmp(nodename, "category")) {
-               if (!strcmp(content, "touch") 
+               if (!strcmp(content, "touch")
                                || !strcmp(content, "non-touch")
                                || !strcmp(content, "default")) {
                        current_libinput_category->type = get_device_type(content);
                } else {
                        current_libinput_category->name = strdup(content);
                }
-       } else if (!strcasecmp(nodename, "naturalscroll")) { 
-               current_libinput_category->natural_scroll = 
+       } else if (!strcasecmp(nodename, "naturalscroll")) {
+               current_libinput_category->natural_scroll =
                        get_bool(content) ? 1 : 0;
        } else if (!strcasecmp(nodename, "lefthanded")) {
                current_libinput_category->left_handed = get_bool(content) ? 1 : 0;
@@ -170,18 +170,18 @@ fill_libinput_category(char *nodename, char *content)
                        current_libinput_category->pointer_speed = 1;
                }
        } else if (!strcasecmp(nodename, "tap")) {
-               current_libinput_category->tap = get_bool(content) ? 
-                       LIBINPUT_CONFIG_TAP_ENABLED : 
+               current_libinput_category->tap = get_bool(content) ?
+                       LIBINPUT_CONFIG_TAP_ENABLED :
                        LIBINPUT_CONFIG_TAP_DISABLED;
        } else if (!strcasecmp(nodename, "accelprofile")) {
                current_libinput_category->accel_profile = get_accel_profile(content);
        } else if (!strcasecmp(nodename, "middleemulation")) {
                current_libinput_category->middle_emu = get_bool(content) ?
                        LIBINPUT_CONFIG_MIDDLE_EMULATION_ENABLED :
-                       LIBINPUT_CONFIG_MIDDLE_EMULATION_DISABLED; 
+                       LIBINPUT_CONFIG_MIDDLE_EMULATION_DISABLED;
        } else if (!strcasecmp(nodename, "disablewhiletyping")) {
                current_libinput_category->dwt = get_bool(content) ?
-                       LIBINPUT_CONFIG_DWT_ENABLED : 
+                       LIBINPUT_CONFIG_DWT_ENABLED :
                        LIBINPUT_CONFIG_DWT_DISABLED;
        }
 }
@@ -341,8 +341,10 @@ static void xml_tree_walk(xmlNode *node);
 static void
 traverse(xmlNode *n)
 {
+       xmlAttr *attr;
+
        process_node(n);
-       for (xmlAttr *attr = n->properties; attr; attr = attr->next) {
+       for (attr = n->properties; attr; attr = attr->next) {
                xml_tree_walk(attr->children);
        }
        xml_tree_walk(n->children);

diff --git a/src/keyboard.c b/src/keyboard.c
index fc3ef64f72e24aa879bf24328625aa556ee15b1b..1460ba90ad1f21ad6381586356594877a2970d5a 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -18,7 +18,7 @@ change_vt(struct server *server, unsigned int vt)
 static bool
 any_modifiers_pressed(struct wlr_keyboard *keyboard)
 {
-       xkb_mod_index_t i ;
+       xkb_mod_index_t i;
        for (i = 0; i < xkb_keymap_num_mods(keyboard->keymap); i++) {
                if (xkb_state_mod_index_is_active
                                (keyboard->xkb_state, i,

diff --git a/src/output.c b/src/output.c
index a4d0ded06c8d14e6690568b0286865ef1b826870..6fb3afe90c45b9ee05ba3db133184e1b98e40258 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -188,7 +188,7 @@ output_drag_icon_for_each_surface(struct output *output, struct seat *seat,
        }
        double ox = seat->cursor->x, oy = seat->cursor->y;
        wlr_output_layout_output_coords(output->server->output_layout,
-                       output->wlr_output, &ox, &oy); 
+                       output->wlr_output, &ox, &oy);
        output_surface_for_each_surface(output, seat->drag_icon->surface,
                        ox, oy, iterator, user_data);
 }

diff --git a/src/seat.c b/src/seat.c
index 1f1a75bf3c53565edd8dd92497878c23131d9eb3..a918978986612505c55414f8986c6f5fb85992e5 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -83,7 +83,7 @@ configure_libinput(struct wlr_input_device *wlr_input_device)
        } else {
                wlr_log(WLR_INFO, "pointer acceleration configured");
                if (dc->pointer_speed > -1) {
-                       libinput_device_config_accel_set_speed(libinput_dev, 
+                       libinput_device_config_accel_set_speed(libinput_dev,
                                dc->pointer_speed);
                }
                if (dc->accel_profile > 0) {
@@ -224,7 +224,7 @@ seat_reconfigure(struct server *server)
        wl_list_for_each(input, &seat->inputs, link) {
                /* We don't configure keyboards by libinput, so skip them */
                if (wlr_input_device_is_libinput(input->wlr_input_device) &&
-                       input->wlr_input_device->type == 
+                       input->wlr_input_device->type ==
                        WLR_INPUT_DEVICE_POINTER) {
                        configure_libinput(input->wlr_input_device);
                }