diff options
| author | Thomas Haller <thaller@redhat.com> | 2023-05-02 07:56:28 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2023-05-02 08:37:20 +0200 |
| commit | cb6f8b987c2b34d1ad325a0faf5a3a9d1d661ce2 (patch) | |
| tree | e3863d506a8d4d6d5c4342f37819d1528eb2f78d /src | |
| parent | 6428ee04a8a08392acb4b74fa5cd18e7f749203f (diff) | |
| download | NetworkManager-cb6f8b987c2b34d1ad325a0faf5a3a9d1d661ce2.tar.gz | |
all: fix various wrong "return FALSE" for returning pointers
Diffstat (limited to 'src')
| -rw-r--r-- | src/libnm-client-impl/nm-conn-utils.c | 16 | ||||
| -rw-r--r-- | src/libnm-glib-aux/nm-ref-string.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/libnm-client-impl/nm-conn-utils.c b/src/libnm-client-impl/nm-conn-utils.c index 223c18e626..08f8403c07 100644 --- a/src/libnm-client-impl/nm-conn-utils.c +++ b/src/libnm-client-impl/nm-conn-utils.c @@ -170,7 +170,7 @@ nm_conn_wireguard_import(const char *filename, GError **error) NM_UTILS_ERROR_UNKNOWN, _("The name of the WireGuard config must be a valid interface " "name followed by \".conf\"")); - return FALSE; + return NULL; } if (!nm_utils_file_get_contents(-1, @@ -250,7 +250,7 @@ nm_conn_wireguard_import(const char *filename, GError **error) current_peer_start_line_nr, filename, error)) - return FALSE; + return NULL; line_context = LINE_CONTEXT_INTERFACE; continue; } @@ -261,7 +261,7 @@ nm_conn_wireguard_import(const char *filename, GError **error) current_peer_start_line_nr, filename, error)) - return FALSE; + return NULL; current_peer_start_line_nr = line_nr; current_peer = nm_wireguard_peer_new(); line_context = LINE_CONTEXT_PEER; @@ -454,7 +454,7 @@ fail_invalid_line: _("unrecognized line at %s:%zu"), filename, line_nr); - return FALSE; + return NULL; fail_invalid_value: nm_utils_error_set(error, NM_UTILS_ERROR_INVALID_ARGUMENT, @@ -462,7 +462,7 @@ fail_invalid_value: matched_key, filename, line_nr); - return FALSE; + return NULL; fail_invalid_secret: nm_utils_error_set(error, NM_UTILS_ERROR_INVALID_ARGUMENT, @@ -470,7 +470,7 @@ fail_invalid_secret: matched_key, filename, line_nr); - return FALSE; + return NULL; } if (!_wg_complete_peer(&data_peers, @@ -478,7 +478,7 @@ fail_invalid_secret: current_peer_start_line_nr, filename, error)) - return FALSE; + return NULL; connection = nm_simple_connection_new(); s_con = NM_SETTING_CONNECTION(nm_setting_connection_new()); @@ -592,7 +592,7 @@ fail_invalid_secret: NM_UTILS_ERROR_INVALID_ARGUMENT, _("Failed to create WireGuard connection: %s"), local->message); - return FALSE; + return NULL; } return g_steal_pointer(&connection); diff --git a/src/libnm-glib-aux/nm-ref-string.h b/src/libnm-glib-aux/nm-ref-string.h index 1b0cabf26d..c7cfe87fd0 100644 --- a/src/libnm-glib-aux/nm-ref-string.h +++ b/src/libnm-glib-aux/nm-ref-string.h @@ -53,7 +53,7 @@ nmtst_ref_string_find(const char *cstr) { /* WARNING: only use for testing. See nmtst_ref_string_find_len() why. */ if (!cstr) - return FALSE; + return NULL; return nmtst_ref_string_find_len(cstr, strlen(cstr)); } |