tree-wide: auto-replace of (struct server *)

#!/bin/bash
    read -r -d '' EXPRS << EOF
    s/xwayland->server/xwayland->svr/g;

    s/\t*struct server \*server;\n//g;
    s/\t*struct server \*server =.*?;\n//gs;
    s/\t*.* = ([a-z_]*->)*server[;,]\n//g;
    s/\{\n\n/\{\n/g;
    s/\n\n+/\n\n/g;

    s/\(\s*struct server \*server\)/(void)/g;
    s/\(\s*struct server \*server,\s*/(/g;
    s/,\s*struct server \*server\)/)/g;
    s/,\s*struct server \*server,\s*/, /g;

    s/\(\s*([a-z_]*->)*server\)/()/g;
    s/\(\s*([a-z_]*->)*server,\s*/(/g;
    s/,\s*([a-z_]*->)*server\)/)/g;
    s/,\s*([a-z_]*->)*server,\s*/, /g;

    s/([a-z_]*->)*server->/g_server./g;

    s/xwayland->svr/xwayland->server/g;
    EOF

    find src include \( -name \*.c -o -name \*.h \) -exec \
        perl -0777 -i -pe "$EXPRS" \{\} \;
This commit is contained in:
John Lindgren 2026-02-23 11:56:39 -05:00
parent 13e06852bf
commit e172f98af0
81 changed files with 1522 additions and 1682 deletions

View file

@ -12,7 +12,7 @@
static bool
other_instances_exist(struct view *self, struct view_query *query)
{
struct wl_list *views = &self->server->views;
struct wl_list *views = &g_server.views;
struct view *view;
wl_list_for_each(view, views, link) {
@ -53,7 +53,7 @@ window_rules_apply(struct view *view, enum window_rule_event event)
continue;
}
if (view_matches_criteria(rule, view)) {
actions_run(view, view->server, &rule->actions, NULL);
actions_run(view, &rule->actions, NULL);
}
}
}