Skip to content

Replace some GLib type aliases with native C types#4093

Merged
clumens merged 39 commits into
ClusterLabs:mainfrom
nrwahl2:nrwahl2-gint
Jun 3, 2026
Merged

Replace some GLib type aliases with native C types#4093
clumens merged 39 commits into
ClusterLabs:mainfrom
nrwahl2:nrwahl2-gint

Conversation

@nrwahl2

@nrwahl2 nrwahl2 commented Apr 27, 2026

Copy link
Copy Markdown
Contributor

The GLib documentation says the standard types should be preferred in new code. See, for example, https://docs.gtk.org/glib/types.html#gint.

I'm opening this as a draft because it's so invasive and is likely to conflict with other ongoing work.

@nrwahl2 nrwahl2 marked this pull request as ready for review May 1, 2026 16:53
@nrwahl2

nrwahl2 commented May 1, 2026

Copy link
Copy Markdown
Contributor Author

Rebased on main

@nrwahl2 nrwahl2 requested a review from clumens May 1, 2026 16:54
clumens
clumens requested changes Jun 2, 2026
View reviewed changes
Comment thread daemons/controld/controld_cib.h Outdated
Comment thread lib/lrmd/lrmd_client.c Outdated
Comment thread lib/pacemaker/pcmk_simulate.c Outdated
Comment thread lib/common/tests/strings/pcmk__uint_from_hash_test.c Outdated
Comment thread lib/common/tests/strings/pcmk__uint_from_hash_test.c Outdated
Comment thread lib/common/tests/strings/pcmk__uint_from_hash_test.c Outdated
Comment thread lib/common/output_text.c Outdated
@clumens clumens added the review: in progress PRs that are currently being reviewed label Jun 2, 2026
nrwahl2 added 22 commits June 2, 2026 14:02
@nrwahl2
Refactor: various: Replace gint with int
9226d49 
The GLib documentation says the standard int should be preferred in new
code. The two are equivalent (via typedef).

https://docs.gtk.org/glib/types.html#gint

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: various: Replace G_MAXUINT with UINT_MAX
2090e93 
The GLib documentation says the standard UINT_MAX should be preferred in
new code. The two are equivalent (via define).

https://docs.gtk.org/glib/types.html#guint

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libpe_status: Clean up includes in internal.h
4dea71d 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libpe_status: Clean up includes in pe_types.h
28932d9 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libpe_status: Clean up includes in bundle.c
0b9a9ca 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libpe_status: Clean up includes in clone.c
cb75626 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libpe_status: Clean up includes in complex.c
3876a8f 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libpe_status: Clean up includes in failcounts.c
dec70ed 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libpe_status: Clean up includes in group.c
481412c 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libpe_status: Clean up includes in native.c
ac22176 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libpe_status: Clean up includes in pe_actions.c
381f50c 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libpe_status: Clean up includes in pe_digest.c
cdef106 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libpe_status: Clean up includes in pe_health.c
d1ef83c 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libpe_status: Clean up includes in pe_notif.c
30427d5 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libpe_status: Clean up includes in pe_output.c
6bc5311 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libpe_status: Clean up includes in remote.c
2a174aa 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libpe_status: Clean up includes in status.c
fc763ef 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libpe_status: Clean up includes in unpack.c
e9b6d92 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libpe_status: Clean up includes in utils.c
cdd4ccd 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libstonithd: Clean up includes in st_output.c
f4ce37f 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libpacemaker: Clean up includes in pcmk_output.c
39e464d 
And replace xmlNodePtr with xmlNode *.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libpacemaker: Clean up includes in pcmk_resource.c
06e7496 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
nrwahl2 added 4 commits June 2, 2026 14:02
@nrwahl2
Refactor: libpacemaker: Clean up includes in pcmk_rule.c
fb30349 
And replace xmlNodePtr with xmlNode *.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libpacemaker: Clean up includes in pcmk_status.c
13472e5 
And replace xmlNodePtr with xmlNode *.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libpacemaker: Clean up includes in pcmk_ticket.c
d9412d5 
And replace xmlNodePtr with xmlNode *.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: scheduler: Add missing includes to pacemaker-schedulerd.c
be2754c 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2

nrwahl2 commented Jun 2, 2026

Copy link
Copy Markdown
Contributor Author

Rebasing first on main to resolve conflict.

@nrwahl2 nrwahl2 marked this pull request as draft June 2, 2026 21:03
nrwahl2 added 11 commits June 2, 2026 14:25
@nrwahl2
Refactor: various: Replace guint with unsigned int
3eb2ac7 
The GLib documentation says the standard unsigned int should be
preferred in new code. The two are equivalent (via typedef). This means
it's also okay to change public API signatures that use guint.

https://docs.gtk.org/glib/types.html#guint

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libcrmcommon: Rename pcmk__xe_get_guint to pcmk__xe_get_uint
1ff982d 
We're no longer using the guint alias.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libcrmcommon: Rename pcmk__xe_set_guint to pcmk__xe_set_uint
a3ce78e 
We're no longer using the guint alias.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libcrmcommon: pcmk__guint_from_hash -> pcmk__uint_from_hash
3cfe6fc 
We're no longer using the guint alias.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Low: libcrmcluster: Add missing glib.h include to compat.h
287c056 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: various: Replace gpointer with void *
bc92479 
The GLib documentation says the standard void * should be preferred in
new code. The two are equivalent (via typedef). This means it's also
okay to change public API signatures that use gpointer.

https://docs.gtk.org/glib/types.html#gpointer

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: various: Replace gconstpointer with const void *
71f54ca 
The GLib documentation says the standard const void * should be
preferred in new code. The two are equivalent (via typedef).

https://docs.gtk.org/glib/types.html#gconstpointer

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: various: Replace gchar with char for function input arguments
661fe93 
The GLib documentation says the standard char should be preferred in new
code. The two are equivalent (via typedef).

This commit replaces gchar with char in function input arguments but
continues to use gchar for output arguments and return values. We could
make an argument for keeping gchar in those cases as a reminder to use
g_free().

https://docs.gtk.org/glib/types.html#gchar

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
API: libpacemaker: pcmk_free_injections() calls free instead of g_free
f82f5ba 
If you're creating or modifying the GList fields of a pcmk_injections_t
object manually, be sure to allocate the list elements using the
malloc() family of allocators. Previously, pcmk_free_injections()
assumed that the list elements had been allocated using the g_malloc()
family of allocators from GLib.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: various: Replace const gchar with const char
3bdb454 
...and replace gchar with char in two static buffers, since they don't
need to be freed.

The GLib documentation says the standard char should be preferred in new
code. The two are equivalent (via typedef).

We could make an argument for keeping gchar in non-const cases as a
reminder to use g_free(). So those replacements can be done in a later
commit, if at all.

https://docs.gtk.org/glib/types.html#gchar

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Doc: liblrmd: Doxygen for lrmd_api_exec()
cff6c66 
And drop the "ms" comments for two arguments.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2 nrwahl2 marked this pull request as ready for review June 2, 2026 21:47
clumens
clumens reviewed Jun 3, 2026
View reviewed changes
Comment thread lib/lrmd/lrmd_client.c Outdated
Comment thread lib/pacemaker/pcmk_simulate.c Outdated
nrwahl2 added 2 commits June 3, 2026 12:02
@nrwahl2
Refactor: liblrmd: Rename lrmd_api_exec() args with _ms suffix
b7747e1 
For clarity, in accordance with our naming conventions.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libcrmcommon: Function open braces on new lines (output funcs)
36898ca 
To align with our style guide.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2

nrwahl2 commented Jun 3, 2026

Copy link
Copy Markdown
Contributor Author

@clumens Removed space in * params.

@clumens clumens merged commit ced274c into ClusterLabs:main Jun 3, 2026
1 check passed
@nrwahl2 nrwahl2 deleted the nrwahl2-gint branch June 3, 2026 20:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@clumens clumens clumens approved these changes

Assignees

No one assigned

Labels

review: in progress PRs that are currently being reviewed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@nrwahl2 @clumens