summaryrefslogtreecommitdiff
path: root/src/nmcli/general.c
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2021-11-09 13:28:54 +0100
committerBeniamino Galvani <bgalvani@redhat.com>2021-11-29 09:31:09 +0000
commit615221a99cdd5059b2632cba923bc04c92165dbc (patch)
tree90f156904bc164fc413832be2246503999634681 /src/nmcli/general.c
parente44cdc79812d82dcf24e915f440497bc503bffe4 (diff)
downloadNetworkManager-615221a99cdd5059b2632cba923bc04c92165dbc.tar.gz
format: reformat source tree with clang-format 13.0
We use clang-format for automatic formatting of our source files. Since clang-format is actively maintained software, the actual formatting depends on the used version of clang-format. That is unfortunate and painful, but really unavoidable unless clang-format would be strictly bug-compatible. So the version that we must use is from the current Fedora release, which is also tested by our gitlab-ci. Previously, we were using Fedora 34 with clang-tools-extra-12.0.1-1.fc34.x86_64. As Fedora 35 comes along, we need to update our formatting as Fedora 35 comes with version "13.0.0~rc1-1.fc35". An alternative would be to freeze on version 12, but that has different problems (like, it's cumbersome to rebuild clang 12 on Fedora 35 and it would be cumbersome for our developers which are on Fedora 35 to use a clang that they cannot easily install). The (differently painful) solution is to reformat from time to time, as we switch to a new Fedora (and thus clang) version. Usually we would expect that such a reformatting brings minor changes. But this time, the changes are huge. That is mentioned in the release notes [1] as Makes PointerAligment: Right working with AlignConsecutiveDeclarations. (Fixes https://llvm.org/PR27353) [1] https://releases.llvm.org/13.0.0/tools/clang/docs/ReleaseNotes.html#clang-format
Diffstat (limited to 'src/nmcli/general.c')
-rw-r--r--src/nmcli/general.c93
1 files changed, 48 insertions, 45 deletions
diff --git a/src/nmcli/general.c b/src/nmcli/general.c
index d87df17a9d..65437e7966 100644
--- a/src/nmcli/general.c
+++ b/src/nmcli/general.c
@@ -108,10 +108,11 @@ static NM_UTILS_LOOKUP_DEFINE(
static const NmcMetaGenericInfo *const metagen_general_status[];
-static gconstpointer _metagen_general_status_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
+static gconstpointer
+_metagen_general_status_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{
- NmCli * nmc = target;
- const char * value;
+ NmCli *nmc = target;
+ const char *value;
gboolean v_bool;
NMState state;
NMConnectivityState connectivity;
@@ -209,12 +210,13 @@ static const NmcMetaGenericInfo
/*****************************************************************************/
-static gconstpointer _metagen_general_permissions_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
+static gconstpointer
+_metagen_general_permissions_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{
NMClientPermission perm = GPOINTER_TO_UINT(target);
- NmCli * nmc = environment_user_data;
+ NmCli *nmc = environment_user_data;
NMClientPermissionResult perm_result;
- const char * s;
+ const char *s;
switch (info->info_type) {
case NMC_GENERIC_INFO_TYPE_GENERAL_PERMISSIONS_PERMISSION:
@@ -252,9 +254,10 @@ typedef struct {
char **domains;
} GetGeneralLoggingData;
-static gconstpointer _metagen_general_logging_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
+static gconstpointer
+_metagen_general_logging_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{
- NmCli * nmc = environment_user_data;
+ NmCli *nmc = environment_user_data;
GetGeneralLoggingData *d = target;
nm_assert(info->info_type < _NMC_GENERIC_INFO_TYPE_GENERAL_LOGGING_NUM);
@@ -466,9 +469,9 @@ static gboolean
show_nm_status(NmCli *nmc, const char *pretty_header_name, const char *print_flds)
{
gs_free_error GError *error = NULL;
- const char * fields_str;
- const char * fields_all = print_flds ?: NMC_FIELDS_NM_STATUS_ALL;
- const char * fields_common = print_flds ?: NMC_FIELDS_NM_STATUS_COMMON;
+ const char *fields_str;
+ const char *fields_all = print_flds ?: NMC_FIELDS_NM_STATUS_ALL;
+ const char *fields_common = print_flds ?: NMC_FIELDS_NM_STATUS_COMMON;
if (!nmc->required_fields || g_ascii_strcasecmp(nmc->required_fields, "common") == 0)
fields_str = fields_common;
@@ -519,9 +522,9 @@ timeout_cb(gpointer user_data)
static void
print_permissions(void *user_data)
{
- NmCli * nmc = user_data;
+ NmCli *nmc = user_data;
gs_free_error GError *error = NULL;
- const char * fields_str = NULL;
+ const char *fields_str = NULL;
gpointer permissions[G_N_ELEMENTS(nm_auth_permission_sorted) + 1];
gboolean is_running;
int i;
@@ -603,9 +606,9 @@ show_nm_permissions(NmCli *nmc)
static void
reload_cb(GObject *source, GAsyncResult *result, gpointer user_data)
{
- NmCli * nmc = user_data;
- gs_free_error GError *error = NULL;
- gs_unref_variant GVariant *ret = NULL;
+ NmCli *nmc = user_data;
+ gs_free_error GError *error = NULL;
+ gs_unref_variant GVariant *ret = NULL;
ret = nm_dbus_call_finish(result, &error);
if (error) {
@@ -622,8 +625,8 @@ static void
do_general_reload(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
{
gs_free const char **values = NULL;
- gs_free char * err_token = NULL;
- gs_free char * joined = NULL;
+ gs_free char *err_token = NULL;
+ gs_free char *joined = NULL;
int flags = 0;
next_arg(nmc, &argc, &argv, NULL);
@@ -694,13 +697,13 @@ do_general_permissions(const NMCCommand *cmd, NmCli *nmc, int argc, const char *
static void
show_general_logging(NmCli *nmc)
{
- gs_free char *level_cache = NULL;
- gs_free char *domains_cache = NULL;
- gs_free_error GError *error = NULL;
- const char * fields_str = NULL;
- GetGeneralLoggingData d = {
- .level = &level_cache,
- .domains = &domains_cache,
+ gs_free char *level_cache = NULL;
+ gs_free char *domains_cache = NULL;
+ gs_free_error GError *error = NULL;
+ const char *fields_str = NULL;
+ GetGeneralLoggingData d = {
+ .level = &level_cache,
+ .domains = &domains_cache,
};
if (!nmc->required_fields || g_ascii_strcasecmp(nmc->required_fields, "common") == 0) {
@@ -742,9 +745,9 @@ nmc_complete_strings_nocase(const char *prefix, ...)
static void
_set_logging_cb(GObject *object, GAsyncResult *result, gpointer user_data)
{
- NmCli * nmc = user_data;
- gs_unref_variant GVariant *res = NULL;
- gs_free_error GError *error = NULL;
+ NmCli *nmc = user_data;
+ gs_unref_variant GVariant *res = NULL;
+ gs_free_error GError *error = NULL;
res = nm_client_dbus_call_finish(NM_CLIENT(object), result, &error);
if (!res) {
@@ -878,7 +881,7 @@ do_general_logging(const NMCCommand *cmd, NmCli *nmc, int argc, const char *cons
static void
save_hostname_cb(GObject *object, GAsyncResult *result, gpointer user_data)
{
- NmCli * nmc = user_data;
+ NmCli *nmc = user_data;
gs_free_error GError *error = NULL;
nm_client_save_hostname_finish(NM_CLIENT(object), result, &error);
@@ -984,9 +987,9 @@ nmc_switch_parse_on_off(NmCli *nmc, const char *arg1, const char *arg2, gboolean
static void
_do_networking_on_off_cb(GObject *object, GAsyncResult *result, gpointer user_data)
{
- NmCli * nmc = user_data;
- gs_unref_variant GVariant *ret = NULL;
- gs_free_error GError *error = NULL;
+ NmCli *nmc = user_data;
+ gs_unref_variant GVariant *ret = NULL;
+ gs_free_error GError *error = NULL;
ret = nm_client_dbus_call_finish(NM_CLIENT(object), result, &error);
if (!ret) {
@@ -1119,7 +1122,7 @@ do_radio_all(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *arg
static void
_do_radio_wifi_cb(GObject *object, GAsyncResult *result, gpointer user_data)
{
- NmCli * nmc = user_data;
+ NmCli *nmc = user_data;
gs_free_error GError *error = NULL;
if (!nm_client_dbus_set_property_finish(NM_CLIENT(object), result, &error)) {
@@ -1214,7 +1217,7 @@ static void
networkmanager_running(NMClient *client, GParamSpec *param, NmCli *nmc)
{
gboolean running;
- char * str;
+ char *str;
running = nm_client_get_nm_running(client);
str = nmc_colorize(&nmc->nmc_config,
@@ -1237,7 +1240,7 @@ static void
client_primary_connection(NMClient *client, GParamSpec *param, NmCli *nmc)
{
NMActiveConnection *primary;
- const char * id;
+ const char *id;
primary = nm_client_get_primary_connection(client);
if (primary) {
@@ -1255,7 +1258,7 @@ static void
client_connectivity(NMClient *client, GParamSpec *param, NmCli *nmc)
{
NMConnectivityState connectivity;
- char * str;
+ char *str;
g_object_get(client, NM_CLIENT_CONNECTIVITY, &connectivity, NULL);
str = nmc_colorize(&nmc->nmc_config,
@@ -1270,7 +1273,7 @@ static void
client_state(NMClient *client, GParamSpec *param, NmCli *nmc)
{
NMState state;
- char * str;
+ char *str;
g_object_get(client, NM_CLIENT_STATE, &state, NULL);
str = nmc_colorize(&nmc->nmc_config,
@@ -1284,8 +1287,8 @@ client_state(NMClient *client, GParamSpec *param, NmCli *nmc)
static void
device_overview(NmCli *nmc, NMDevice *device)
{
- GString * outbuf = g_string_sized_new(80);
- char * tmp;
+ GString *outbuf = g_string_sized_new(80);
+ char *tmp;
const GPtrArray *activatable;
activatable = nm_device_get_available_connections(device);
@@ -1392,8 +1395,8 @@ device_overview(NmCli *nmc, NMDevice *device)
static void
ac_overview(NmCli *nmc, NMActiveConnection *ac)
{
- GString * outbuf = g_string_sized_new(80);
- NMIPConfig * ip;
+ GString *outbuf = g_string_sized_new(80);
+ NMIPConfig *ip;
nm_auto_str_buf NMStrBuf str = NM_STR_BUF_INIT(NM_UTILS_GET_NEXT_REALLOC_SIZE_104, FALSE);
if (nm_active_connection_get_master(ac)) {
@@ -1463,12 +1466,12 @@ ac_overview(NmCli *nmc, NMActiveConnection *ac)
void
nmc_command_func_overview(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
{
- NMDevice ** devices;
- const GPtrArray * p;
+ NMDevice **devices;
+ const GPtrArray *p;
NMActiveConnection *ac;
NMMetaColor color;
- NMDnsEntry * dns;
- char * tmp;
+ NMDnsEntry *dns;
+ char *tmp;
int i;
next_arg(nmc, &argc, &argv, NULL);