fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-01 03:20:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: fix enum argument in prototype of nm_utils_kill_process_sync(), etc.

Browse source 
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: 067202b34e ('core: use explict NMLogDomain enum instead of int')
(cherry picked from commit a60476b27f)
(cherry picked from commit 18047f09d4)
This commit is contained in:
Thomas Haller 2023-01-18 16:19:09 +01:00
parent 309cc0e2f2
commit b2b49df992
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/nm-core-utils.h
View file

@ -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,