diff options
| author | Thomas Haller <thaller@redhat.com> | 2023-01-18 16:19:09 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2023-01-26 09:22:43 +0100 |
| commit | 18047f09d4501bf7290f1d5df8856ddc20559168 (patch) | |
| tree | 3a92c14c0e42e8b450239e9c528590a194f35687 | |
| parent | 7122ef4007068309698a7f4a9ce656c0142872e7 (diff) | |
core: fix enum argument in prototype of nm_utils_kill_process_sync(), etc.
This avoids a new compiler warning with gcc 13.0.0-0.9.fc38:
../src/core/nm-core-utils.c:482:1: error: conflicting types for 'nm_utils_kill_child_async' due to enum/integer mismatch; have 'void(pid_t, int, NMLogDomain, const char *, guint32, void (*)(pid_t, gboolean, int, void *), void *)' {aka 'void(int, int, NMLogDomain, const char *, unsigned int, void (*)(int, int, int, void *), void *)'} [-Werror=enum-int-mismatch]
482 | nm_utils_kill_child_async(pid_t pid,
| ^~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../src/core/nm-core-utils.c:9:
Fixes: 067202b34e5a ('core: use explict NMLogDomain enum instead of int')
(cherry picked from commit a60476b27f011cc7609796461a1afd6eefdc1747)
| -rw-r--r-- | src/core/nm-core-utils.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/nm-core-utils.h b/src/core/nm-core-utils.h index d1a62a607f..483af077f8 100644 --- a/src/core/nm-core-utils.h +++ b/src/core/nm-core-utils.h @@ -154,7 +154,7 @@ nm_utils_ip_route_metric_penalize(guint32 metric, guint32 penalty) void nm_utils_kill_process_sync(pid_t pid, guint64 start_time, int sig, - guint64 log_domain, + NMLogDomain log_domain, const char *log_name, guint32 wait_before_kill_msec, guint32 sleep_duration_msec, @@ -166,14 +166,14 @@ typedef void (*NMUtilsKillChildAsyncCb)(pid_t pid, void *user_data); void nm_utils_kill_child_async(pid_t pid, int sig, - guint64 log_domain, + NMLogDomain log_domain, const char *log_name, guint32 wait_before_kill_msec, NMUtilsKillChildAsyncCb callback, void *user_data); gboolean nm_utils_kill_child_sync(pid_t pid, int sig, - guint64 log_domain, + NMLogDomain log_domain, const char *log_name, int *child_status, guint32 wait_before_kill_msec, |