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 committed by Johan Malm
parent 60ac8f07bb
commit cb49bddf63
81 changed files with 1522 additions and 1682 deletions

View file

@ -6,14 +6,12 @@
struct server;
void desktop_entry_init(struct server *server);
void desktop_entry_finish(struct server *server);
void desktop_entry_init(void);
void desktop_entry_finish(void);
struct lab_img *desktop_entry_load_icon_from_app_id(
struct server *server, const char *app_id, int size, float scale);
struct lab_img *desktop_entry_load_icon_from_app_id(const char *app_id, int size, float scale);
struct lab_img *desktop_entry_load_icon(
struct server *server, const char *icon_name, int size, float scale);
struct lab_img *desktop_entry_load_icon(const char *icon_name, int size, float scale);
/**
* desktop_entry_name_lookup() - return the application name
@ -22,8 +20,7 @@ struct lab_img *desktop_entry_load_icon(
* The lifetime of the returned value is the same as that
* of sfdo_desktop_db (from `struct sfdo.desktop_db`)
*/
const char *desktop_entry_name_lookup(struct server *server,
const char *app_id);
const char *desktop_entry_name_lookup(const char *app_id);
#endif /* HAVE_LIBSFDO */
#endif /* LABWC_DESKTOP_ENTRY_H */