colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

format: reformat source tree with clang-format 13.0

Browse Source 
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
This commit is contained in:
Thomas Haller
2021-11-09 13:28:54 +01:00
committed by Beniamino Galvani
parent e44cdc7981
commit 615221a99c
633 changed files with 21047 additions and 20964 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/nmcli/agent.c
View File

@@ -56,7 +56,8 @@ usage_agent_all(void)
static char *pre_input_deftext;
static int set_deftext(_NMC_RL_STARTUPHOOK_ARGS)
static int
set_deftext(_NMC_RL_STARTUPHOOK_ARGS)
{
if (pre_input_deftext && rl_startup_hook) {
rl_insert_text(pre_input_deftext);
@@ -68,16 +69,16 @@ static int set_deftext(_NMC_RL_STARTUPHOOK_ARGS)
static gboolean
get_secrets_from_user(const NmcConfig *nmc_config,
const char * request_id,
const char * title,
const char * msg,
GPtrArray * secrets)
const char *request_id,
const char *title,
const char *msg,
GPtrArray *secrets)
{
int i;
for (i = 0; i < secrets->len; i++) {
NMSecretAgentSimpleSecret *secret = secrets->pdata[i];
char * pwd = NULL;
char *pwd = NULL;
/* Ask user for the password */
if (msg)
@@ -103,13 +104,13 @@ get_secrets_from_user(const NmcConfig *nmc_config,
static void
secrets_requested(NMSecretAgentSimple *agent,
const char * request_id,
const char * title,
const char * msg,
GPtrArray * secrets,
const char *request_id,
const char *title,
const char *msg,
GPtrArray *secrets,
gpointer user_data)
{
NmCli * nmc = user_data;
NmCli *nmc = user_data;
gboolean success;
if (nmc->nmc_config.print_output == NMC_PRINT_PRETTY)

152
src/nmcli/common.c
View File

@@ -30,8 +30,8 @@ static char **
_ip_config_get_routes(NMIPConfig *cfg)
{
gs_unref_hashtable GHashTable *hash = NULL;
GPtrArray * ptr_array;
char ** arr;
GPtrArray *ptr_array;
char **arr;
guint i;
ptr_array = nm_ip_config_get_routes(cfg);
@@ -43,12 +43,12 @@ _ip_config_get_routes(NMIPConfig *cfg)
arr = g_new(char *, ptr_array->len + 1);
for (i = 0; i < ptr_array->len; i++) {
NMIPRoute * route = g_ptr_array_index(ptr_array, i);
NMIPRoute *route = g_ptr_array_index(ptr_array, i);
gs_strfreev char **names = NULL;
gsize j;
GString * str;
GString *str;
guint64 metric;
gs_free char * attributes = NULL;
gs_free char *attributes = NULL;
str = g_string_new(NULL);
g_string_append_printf(
@@ -92,14 +92,15 @@ _ip_config_get_routes(NMIPConfig *cfg)
/*****************************************************************************/
static gconstpointer _metagen_ip4_config_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
static gconstpointer
_metagen_ip4_config_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{
NMIPConfig * cfg4 = target;
GPtrArray * ptr_array;
char ** arr;
NMIPConfig *cfg4 = target;
GPtrArray *ptr_array;
char **arr;
const char *const *arrc;
guint i = 0;
const char * str;
const char *str;
nm_assert(info->info_type < _NMC_GENERIC_INFO_TYPE_IP4_CONFIG_NUM);
@@ -185,14 +186,15 @@ const NmcMetaGenericInfo *const metagen_ip4_config[_NMC_GENERIC_INFO_TYPE_IP4_CO
/*****************************************************************************/
static gconstpointer _metagen_ip6_config_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
static gconstpointer
_metagen_ip6_config_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{
NMIPConfig * cfg6 = target;
GPtrArray * ptr_array;
char ** arr;
NMIPConfig *cfg6 = target;
GPtrArray *ptr_array;
char **arr;
const char *const *arrc;
guint i = 0;
const char * str;
const char *str;
nm_assert(info->info_type < _NMC_GENERIC_INFO_TYPE_IP6_CONFIG_NUM);
@@ -272,18 +274,19 @@ const NmcMetaGenericInfo *const metagen_ip6_config[_NMC_GENERIC_INFO_TYPE_IP6_CO
/*****************************************************************************/
static gconstpointer _metagen_dhcp_config_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
static gconstpointer
_metagen_dhcp_config_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{
NMDhcpConfig *dhcp = target;
guint i;
char ** arr = NULL;
char **arr = NULL;
NMC_HANDLE_COLOR(NM_META_COLOR_NONE);
switch (info->info_type) {
case NMC_GENERIC_INFO_TYPE_DHCP_CONFIG_OPTION:
{
GHashTable * table;
GHashTable *table;
gs_free char **arr2 = NULL;
guint n;
@@ -333,13 +336,13 @@ const NmcMetaGenericInfo *const metagen_dhcp_config[_NMC_GENERIC_INFO_TYPE_DHCP_
/*****************************************************************************/
gboolean
print_ip_config(NMIPConfig * cfg,
print_ip_config(NMIPConfig *cfg,
int addr_family,
const NmcConfig *nmc_config,
const char * one_field)
const char *one_field)
{
gs_free_error GError *error = NULL;
gs_free char * field_str = NULL;
gs_free char *field_str = NULL;
if (!cfg)
return FALSE;
@@ -364,13 +367,13 @@ print_ip_config(NMIPConfig * cfg,
}
gboolean
print_dhcp_config(NMDhcpConfig * dhcp,
print_dhcp_config(NMDhcpConfig *dhcp,
int addr_family,
const NmcConfig *nmc_config,
const char * one_field)
const char *one_field)
{
gs_free_error GError *error = NULL;
gs_free char * field_str = NULL;
gs_free char *field_str = NULL;
if (!dhcp)
return FALSE;
@@ -416,16 +419,16 @@ print_dhcp_config(NMDhcpConfig * dhcp,
*/
NMConnection *
nmc_find_connection(const GPtrArray *connections,
const char * filter_type,
const char * filter_val,
GPtrArray ** out_result,
const char *filter_type,
const char *filter_val,
GPtrArray **out_result,
gboolean complete)
{
NMConnection * best_candidate_uuid = NULL;
NMConnection * best_candidate = NULL;
gs_unref_ptrarray GPtrArray *result_allocated = NULL;
GPtrArray * result = out_result ? *out_result : NULL;
const guint result_inital_len = result ? result->len : 0u;
NMConnection *best_candidate_uuid = NULL;
NMConnection *best_candidate = NULL;
gs_unref_ptrarray GPtrArray *result_allocated = NULL;
GPtrArray *result = out_result ? *out_result : NULL;
const guint result_inital_len = result ? result->len : 0u;
guint i, j;
nm_assert(connections);
@@ -434,8 +437,8 @@ nmc_find_connection(const GPtrArray *connections,
for (i = 0; i < connections->len; i++) {
gboolean match_by_uuid = FALSE;
NMConnection *connection;
const char * v;
const char * v_num;
const char *v;
const char *v_num;
connection = NM_CONNECTION(connections->pdata[i]);
@@ -517,21 +520,21 @@ found:
NMActiveConnection *
nmc_find_active_connection(const GPtrArray *active_cons,
const char * filter_type,
const char * filter_val,
GPtrArray ** out_result,
const char *filter_type,
const char *filter_val,
GPtrArray **out_result,
gboolean complete)
{
guint i, j;
NMActiveConnection *best_candidate = NULL;
GPtrArray * result = out_result ? *out_result : NULL;
GPtrArray *result = out_result ? *out_result : NULL;
nm_assert(filter_val);
for (i = 0; i < active_cons->len; i++) {
NMRemoteConnection *con;
NMActiveConnection *candidate = g_ptr_array_index(active_cons, i);
const char * v, *v_num;
const char *v, *v_num;
con = nm_active_connection_get_connection(candidate);
@@ -606,9 +609,9 @@ found:
static gboolean
vpn_openconnect_get_secrets(NMConnection *connection, GPtrArray *secrets)
{
GError * error = NULL;
GError *error = NULL;
NMSettingVpn *s_vpn;
const char * gw, *port;
const char *gw, *port;
gs_free char *cookie = NULL;
gs_free char *gateway = NULL;
gs_free char *gwcert = NULL;
@@ -679,13 +682,13 @@ vpn_openconnect_get_secrets(NMConnection *connection, GPtrArray *secrets)
static gboolean
get_secrets_from_user(const NmcConfig *nmc_config,
const char * request_id,
const char * title,
const char * msg,
NMConnection * connection,
const char *request_id,
const char *title,
const char *msg,
NMConnection *connection,
gboolean ask,
GHashTable * pwds_hash,
GPtrArray * secrets)
GHashTable *pwds_hash,
GPtrArray *secrets)
{
int i;
@@ -695,7 +698,7 @@ get_secrets_from_user(const NmcConfig *nmc_config,
for (i = 0; i < secrets->len; i++) {
NMSecretAgentSimpleSecret *secret = secrets->pdata[i];
char * pwd = NULL;
char *pwd = NULL;
/* First try to find the password in provided passwords file,
* then ask user. */
@@ -764,15 +767,15 @@ get_secrets_from_user(const NmcConfig *nmc_config,
*/
void
nmc_secrets_requested(NMSecretAgentSimple *agent,
const char * request_id,
const char * title,
const char * msg,
GPtrArray * secrets,
const char *request_id,
const char *title,
const char *msg,
GPtrArray *secrets,
gpointer user_data)
{
NmCli * nmc = (NmCli *) user_data;
NMConnection * connection = NULL;
char * path, *p;
NmCli *nmc = (NmCli *) user_data;
NMConnection *connection = NULL;
char *path, *p;
gboolean success = FALSE;
const GPtrArray *connections;
@@ -814,8 +817,8 @@ char *
nmc_unique_connection_name(const GPtrArray *connections, const char *try_name)
{
NMConnection *connection;
const char * name;
char * new_name;
const char *name;
char *new_name;
unsigned num = 1;
int i = 0;
@@ -837,7 +840,7 @@ nmc_unique_connection_name(const GPtrArray *connections, const char *try_name)
/* readline state variables */
static gboolean nmcli_in_readline = FALSE;
static gboolean rl_got_line;
static char * rl_string;
static char *rl_string;
/**
* nmc_cleanup_readline:
@@ -978,7 +981,7 @@ nmc_secret_redisplay(void)
{
int save_point = rl_point;
int save_end = rl_end;
char * save_line_buffer = rl_line_buffer;
char *save_line_buffer = rl_line_buffer;
const char *subst = nmc_password_subst_char();
int subst_len = strlen(subst);
int i;
@@ -1009,7 +1012,7 @@ nmc_readline_echo(const NmcConfig *nmc_config, gboolean echo_on, const char *pro
{
va_list args;
gs_free char *prompt = NULL;
char * str;
char *str;
#if HAVE_READLINE_HISTORY
nm_auto_free HISTORY_STATE *saved_history = NULL;
HISTORY_STATE passwd_history = {
@@ -1129,8 +1132,8 @@ nmc_rl_gen_func_ifnames(const char *text, int state)
{
int i;
const GPtrArray *devices;
const char ** ifnames;
char * ret;
const char **ifnames;
char *ret;
devices = nm_client_get_devices(nm_cli_global_readline->client);
if (devices->len == 0)
@@ -1138,7 +1141,7 @@ nmc_rl_gen_func_ifnames(const char *text, int state)
ifnames = g_new(const char *, devices->len + 1);
for (i = 0; i < devices->len; i++) {
NMDevice * dev = g_ptr_array_index(devices, i);
NMDevice *dev = g_ptr_array_index(devices, i);
const char *ifname = nm_device_get_iface(dev);
ifnames[i] = ifname;
}
@@ -1152,7 +1155,8 @@ nmc_rl_gen_func_ifnames(const char *text, int state)
char *nmc_rl_pre_input_deftext;
int nmc_rl_set_deftext(_NMC_RL_STARTUPHOOK_ARGS)
int
nmc_rl_set_deftext(_NMC_RL_STARTUPHOOK_ARGS)
{
if (nmc_rl_pre_input_deftext && rl_startup_hook) {
rl_insert_text(nmc_rl_pre_input_deftext);
@@ -1186,7 +1190,7 @@ nmc_parse_lldp_capabilities(guint value)
"s-vlan-component",
"tpmr"};
gboolean first = TRUE;
GString * str;
GString *str;
int i;
if (!value)
@@ -1217,8 +1221,8 @@ nmc_parse_lldp_capabilities(guint value)
static void
command_done(GObject *object, GAsyncResult *res, gpointer user_data)
{
GTask * task = G_TASK(res);
NmCli * nmc = user_data;
GTask *task = G_TASK(res);
NmCli *nmc = user_data;
gs_free_error GError *error = NULL;
if (!g_task_propagate_boolean(task, &error)) {
@@ -1233,8 +1237,8 @@ command_done(GObject *object, GAsyncResult *res, gpointer user_data)
typedef struct {
const NMCCommand *cmd;
int argc;
char ** argv;
GTask * task;
char **argv;
GTask *task;
} CmdCall;
static void
@@ -1243,10 +1247,10 @@ call_cmd(NmCli *nmc, GTask *task, const NMCCommand *cmd, int argc, const char *c
static void
got_client(GObject *source_object, GAsyncResult *res, gpointer user_data)
{
gs_unref_object GTask *task = NULL;
gs_free_error GError *error = NULL;
CmdCall * call = user_data;
NmCli * nmc;
gs_unref_object GTask *task = NULL;
gs_free_error GError *error = NULL;
CmdCall *call = user_data;
NmCli *nmc;
nm_assert(NM_IS_CLIENT(source_object));
@@ -1343,7 +1347,7 @@ nmc_complete_help(const char *prefix)
void
nmc_do_cmd(NmCli *nmc, const NMCCommand cmds[], const char *cmd, int argc, const char *const *argv)
{
const NMCCommand *c;
const NMCCommand *c;
gs_unref_object GTask *task = NULL;
task = nm_g_task_new(NULL, NULL, nmc_do_cmd, command_done, nmc);

32
src/nmcli/common.h
View File

@@ -9,33 +9,33 @@
#include "nmcli.h"
#include "libnmc-base/nm-secret-agent-simple.h"
gboolean print_ip_config(NMIPConfig * cfg,
gboolean print_ip_config(NMIPConfig *cfg,
int addr_family,
const NmcConfig *nmc_config,
const char * one_field);
const char *one_field);
gboolean print_dhcp_config(NMDhcpConfig * dhcp,
gboolean print_dhcp_config(NMDhcpConfig *dhcp,
int addr_family,
const NmcConfig *nmc_config,
const char * one_field);
const char *one_field);
NMConnection *nmc_find_connection(const GPtrArray *connections,
const char * filter_type,
const char * filter_val,
GPtrArray ** out_result,
const char *filter_type,
const char *filter_val,
GPtrArray **out_result,
gboolean complete);
NMActiveConnection *nmc_find_active_connection(const GPtrArray *active_cons,
const char * filter_type,
const char * filter_val,
GPtrArray ** out_result,
const char *filter_type,
const char *filter_val,
GPtrArray **out_result,
gboolean complete);
void nmc_secrets_requested(NMSecretAgentSimple *agent,
const char * request_id,
const char * title,
const char * msg,
GPtrArray * secrets,
const char *request_id,
const char *title,
const char *msg,
GPtrArray *secrets,
gpointer user_data);
char *nmc_unique_connection_name(const GPtrArray *connections, const char *try_name);
@@ -45,8 +45,8 @@ char *nmc_readline(const NmcConfig *nmc_config, const char *prompt_fmt, ...) G_G
char *nmc_readline_echo(const NmcConfig *nmc_config, gboolean echo_on, const char *prompt_fmt, ...)
G_GNUC_PRINTF(3, 4);
NmcCompEntryFunc nmc_rl_compentry_func_wrap(const char *const *values);
char * nmc_rl_gen_func_basic(const char *text, int state, const char *const *words);
char * nmc_rl_gen_func_ifnames(const char *text, int state);
char *nmc_rl_gen_func_basic(const char *text, int state, const char *const *words);
char *nmc_rl_gen_func_ifnames(const char *text, int state);
gboolean nmc_get_in_readline(void);
void nmc_set_in_readline(gboolean in_readline);

1117
src/nmcli/connections.c
View File

File diff suppressed because it is too large Load Diff

8
src/nmcli/connections.h
View File

@@ -10,12 +10,12 @@
void monitor_connections(NmCli *nmc);
gboolean nmc_process_connection_properties(NmCli * nmc,
NMConnection * connection,
int * argc,
gboolean nmc_process_connection_properties(NmCli *nmc,
NMConnection *connection,
int *argc,
const char *const **argv,
gboolean allow_remove_setting,
GError ** error);
GError **error);
NMMetaColor nmc_active_connection_state_to_color(NMActiveConnection *ac);

524
src/nmcli/devices.c
View File

File diff suppressed because it is too large Load Diff

93
src/nmcli/general.c
View File

@@ -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);

10
src/nmcli/generate-docs-nm-settings-nmcli.c
View File

@@ -34,8 +34,8 @@ main(int argc, char *argv[])
for (i_sett_infos = 0; i_sett_infos < G_N_ELEMENTS(nm_meta_setting_infos_editor);
i_sett_infos++) {
const NMMetaSettingInfoEditor *sett_info = &nm_meta_setting_infos_editor[i_sett_infos];
gs_free char * tmp_s1 = NULL;
gs_free char * tmp_s2 = NULL;
gs_free char *tmp_s1 = NULL;
gs_free char *tmp_s2 = NULL;
g_print("%s<setting", _indent_level(INDENT));
g_print(" name=%s", tmp_s1 = _xml_escape_attribute(sett_info->general->setting_name));
@@ -47,9 +47,9 @@ main(int argc, char *argv[])
for (i_property = 0; i_property < sett_info->properties_num; i_property++) {
const NMMetaPropertyInfo *prop_info = sett_info->properties[i_property];
gs_free char * tmp2 = NULL;
gs_free char * tmp3 = NULL;
gs_free char * tmp4 = NULL;
gs_free char *tmp2 = NULL;
gs_free char *tmp3 = NULL;
gs_free char *tmp4 = NULL;
g_print("%s<property", _indent_level(2 * INDENT));
g_print(" name=%s", tmp2 = _xml_escape_attribute(prop_info->property_name));

26
src/nmcli/nmcli.c
View File

@@ -118,7 +118,7 @@ typedef struct {
} ArgsInfo;
/* --- Global variables --- */
GMainLoop * loop = NULL;
GMainLoop *loop = NULL;
struct termios termios_orig;
NM_CACHED_QUARK_FCN("nmcli-error-quark", nmcli_error_quark);
@@ -150,10 +150,10 @@ static void
complete_one(gpointer key, gpointer value, gpointer user_data)
{
const char **option_with_value = user_data;
const char * option = option_with_value[0];
const char * prefix = option_with_value[1];
const char * name = key;
const char * last;
const char *option = option_with_value[0];
const char *prefix = option_with_value[1];
const char *name = key;
const char *last;
last = strrchr(prefix, ',');
if (last)
@@ -272,9 +272,9 @@ static gboolean
matches_arg(NmCli *nmc, int *argc, const char *const **argv, const char *pattern, char **arg)
{
gs_free char *opt_free = NULL;
const char * opt = (*argv)[0];
const char *opt = (*argv)[0];
gs_free char *arg_tmp = NULL;
const char * s;
const char *s;
nm_assert(opt);
nm_assert(opt[0] == '-');
@@ -377,7 +377,7 @@ check_colors_check_palette_one_file(const char *base_dir, const char *name, cons
for (i = 0; i < G_N_ELEMENTS(extensions); i++) {
gs_free char *filename = NULL;
char * contents;
char *contents;
filename = check_colors_construct_filename(base_dir, name, term, extensions[i]);
if (g_file_get_contents(filename, &contents, NULL, NULL))
@@ -470,9 +470,9 @@ check_colors_check_palette(const char *base_dir_1,
static gboolean
check_colors(NmcColorOption color_option, char **out_palette_str)
{
const char * base_dir_1, *base_dir_2;
const char *base_dir_1, *base_dir_2;
const char *const NAME = "nmcli";
const char * term;
const char *term;
*out_palette_str = NULL;
@@ -681,8 +681,8 @@ parse_color_scheme(char *palette_buffer, NmcColorPalette *out_palette, GError **
static void
set_colors(NmcColorOption color_option,
bool * out_use_colors,
char ** out_palette_buffer,
bool *out_use_colors,
char **out_palette_buffer,
NmcColorPalette *out_palette)
{
gs_free char *palette_str = NULL;
@@ -730,7 +730,7 @@ process_command_line(NmCli *nmc, int argc, char **argv_orig)
{NULL, nmc_command_func_overview, usage, TRUE, TRUE},
};
NmcColorOption colors = NMC_USE_COLOR_AUTO;
const char * base;
const char *base;
const char *const *argv;
base = strrchr(argv_orig[0], '/');

14
src/nmcli/nmcli.h
View File

@@ -85,7 +85,7 @@ typedef struct _NmcMetaGenericInfo NmcMetaGenericInfo;
struct _NmcOutputField {
const NMMetaAbstractInfo *info;
int width; /* Width in screen columns */
void * value; /* Value of current field - char* or char** (NULL-terminated array) */
void *value; /* Value of current field - char* or char** (NULL-terminated array) */
gboolean value_is_array; /* Whether value is char** instead of char* */
gboolean free_value; /* Whether to free the value */
NmcOfFlags flags; /* Flags - whether and how to print values/field names/headers */
@@ -118,14 +118,14 @@ typedef struct _NmCli {
NMClient *client; /* Pointer to NMClient of libnm */
NMCResultCode return_value; /* Return code of nmcli */
GString * return_text; /* Reason text */
GString *return_text; /* Reason text */
NmcPagerData pager_data;
int timeout; /* Operation timeout */
NMSecretAgentSimple * secret_agent; /* Secret agent */
GHashTable * pwds_hash; /* Hash table with passwords in passwd-file */
NMSecretAgentSimple *secret_agent; /* Secret agent */
GHashTable *pwds_hash; /* Hash table with passwords in passwd-file */
struct _NMPolkitListener *pk_listener; /* polkit agent listener */
int should_wait; /* Semaphore indicating whether nmcli should not end or not yet */
@@ -135,7 +135,7 @@ typedef struct _NmCli {
const NmcConfig nmc_config;
NmcConfig nmc_config_mutable;
};
char * required_fields; /* Required fields in output: '--fields' option */
char *required_fields; /* Required fields in output: '--fields' option */
gboolean ask; /* Ask for missing parameters: option '--ask' */
gboolean complete; /* Autocomplete the command line */
gboolean editor_status_line; /* Whether to display status line in connection editor */
@@ -163,9 +163,9 @@ void nm_cli_spawn_pager(const NmcConfig *nmc_config, NmcPagerData *pager_data);
void nmc_empty_output_fields(NmcOutputData *output_data);
#define NMC_OUTPUT_DATA_DEFINE_SCOPED(out) \
gs_unref_array GArray * out##_indices = NULL; \
gs_unref_array GArray *out##_indices = NULL; \
nm_auto(nmc_empty_output_fields) NmcOutputData out = { \
.output_data = g_ptr_array_new_full(20, g_free), \
.output_data = g_ptr_array_new_full(20, g_free), \
}
/*****************************************************************************/

2
src/nmcli/polkit-agent.c
View File

@@ -43,7 +43,7 @@ gboolean
nmc_polkit_agent_init(NmCli *nmc, gboolean for_session, GError **error)
{
NMPolkitListener *listener;
GDBusConnection * dbus_connection = NULL;
GDBusConnection *dbus_connection = NULL;
g_return_val_if_fail(error == NULL || *error == NULL, FALSE);

78
src/nmcli/settings.c
View File

@@ -24,8 +24,8 @@
static gboolean
get_answer(const char *prop, const char *value)
{
char * tmp_str;
char * question;
char *tmp_str;
char *question;
gboolean answer = FALSE;
if (value)
@@ -226,7 +226,7 @@ proxy_method_changed_cb(GObject *object, GParamSpec *pspec, gpointer user_data)
static void
wireless_band_channel_changed_cb(GObject *object, GParamSpec *pspec, gpointer user_data)
{
const char * value = NULL, *mode;
const char *value = NULL, *mode;
char str[16];
NMSettingWireless *s_wireless = NM_SETTING_WIRELESS(object);
@@ -257,9 +257,9 @@ static void
connection_master_changed_cb(GObject *object, GParamSpec *pspec, gpointer user_data)
{
NMSettingConnection *s_con = NM_SETTING_CONNECTION(object);
NMConnection * connection = NM_CONNECTION(user_data);
NMSetting * s_ipv4, *s_ipv6;
const char * value, *tmp_str;
NMConnection *connection = NM_CONNECTION(user_data);
NMSetting *s_ipv4, *s_ipv6;
const char *value, *tmp_str;
value = nm_setting_connection_get_master(s_con);
if (value) {
@@ -350,16 +350,16 @@ nmc_setting_connection_connect_handlers(NMSettingConnection *setting, NMConnecti
/*****************************************************************************/
static gboolean
_set_fcn_precheck_connection_secondaries(NMClient * client,
_set_fcn_precheck_connection_secondaries(NMClient *client,
const char *value,
char ** value_coerced,
GError ** error)
char **value_coerced,
GError **error)
{
const GPtrArray * connections;
NMConnection * con;
const GPtrArray *connections;
NMConnection *con;
gs_free const char **strv0 = NULL;
gs_strfreev char ** strv = NULL;
char ** iter;
gs_strfreev char **strv = NULL;
char **iter;
gboolean modified = FALSE;
strv0 = nm_strsplit_set(value, " \t,");
@@ -419,7 +419,7 @@ _env_warn_fcn_handle(
fmt_l10n, /* the untranslated format string, but it is marked for translation using N_(). */
va_list ap)
{
NmCli * nmc = environment_user_data;
NmCli *nmc = environment_user_data;
gs_free char *m = NULL;
if (nmc->complete)
@@ -443,9 +443,9 @@ _env_warn_fcn_handle(
static NMDevice *const *
_env_get_nm_devices(const NMMetaEnvironment *environment,
gpointer environment_user_data,
guint * out_len)
guint *out_len)
{
NmCli * nmc = environment_user_data;
NmCli *nmc = environment_user_data;
const GPtrArray *devices;
nm_assert(nmc);
@@ -467,9 +467,9 @@ _env_get_nm_devices(const NMMetaEnvironment *environment,
static NMRemoteConnection *const *
_env_get_nm_connections(const NMMetaEnvironment *environment,
gpointer environment_user_data,
guint * out_len)
guint *out_len)
{
NmCli * nmc = environment_user_data;
NmCli *nmc = environment_user_data;
const GPtrArray *values;
nm_assert(nmc);
@@ -497,11 +497,11 @@ const NMMetaEnvironment *const nmc_meta_environment = &((NMMetaEnvironment){
});
static char *
get_property_val(NMSetting * setting,
const char * prop,
get_property_val(NMSetting *setting,
const char *prop,
NMMetaAccessorGetType get_type,
gboolean show_secrets,
GError ** error)
GError **error)
{
const NMMetaPropertyInfo *property_info;
@@ -514,8 +514,8 @@ get_property_val(NMSetting * setting,
if ((property_info = nm_meta_property_info_find_by_setting(setting, prop))) {
if (property_info->property_type->get_fcn) {
NMMetaAccessorGetOutFlags out_flags = NM_META_ACCESSOR_GET_OUT_FLAGS_NONE;
char * to_free = NULL;
const char * value;
char *to_free = NULL;
const char *value;
value = property_info->property_type->get_fcn(
property_info,
@@ -560,15 +560,15 @@ nmc_setting_get_property_parsable(NMSetting *setting, const char *prop, GError *
}
gboolean
nmc_setting_set_property(NMClient * client,
NMSetting * setting,
const char * prop,
nmc_setting_set_property(NMClient *client,
NMSetting *setting,
const char *prop,
NMMetaAccessorModifier modifier,
const char * value,
GError ** error)
const char *value,
GError **error)
{
const NMMetaPropertyInfo *property_info;
gs_free char * value_to_free = NULL;
gs_free char *value_to_free = NULL;
gboolean success;
g_return_val_if_fail(NM_IS_SETTING(setting), FALSE);
@@ -639,7 +639,7 @@ char **
nmc_setting_get_valid_properties(NMSetting *setting)
{
const NMMetaSettingInfoEditor *setting_info;
char ** valid_props;
char **valid_props;
guint i, num;
setting_info = nm_meta_setting_info_editor_find_by_setting(setting);
@@ -686,14 +686,14 @@ nmc_setting_get_property_allowed_values(NMSetting *setting, const char *prop, ch
char *
nmc_setting_get_property_desc(NMSetting *setting, const char *prop)
{
gs_free char * desc_to_free = NULL;
const char * setting_desc = NULL;
const char * setting_desc_title = "";
const char * nmcli_desc = NULL;
const char * nmcli_desc_title = "";
const char * nmcli_nl = "";
gs_free char *desc_to_free = NULL;
const char *setting_desc = NULL;
const char *setting_desc_title = "";
const char *nmcli_desc = NULL;
const char *nmcli_desc_title = "";
const char *nmcli_nl = "";
const NMMetaPropertyInfo *property_info;
const char * desc = NULL;
const char *desc = NULL;
g_return_val_if_fail(NM_IS_SETTING(setting), FALSE);
@@ -732,8 +732,8 @@ gboolean
setting_details(const NmcConfig *nmc_config, NMSetting *setting, const char *one_prop)
{
const NMMetaSettingInfoEditor *setting_info;
gs_free_error GError *error = NULL;
gs_free char * fields_str = NULL;
gs_free_error GError *error = NULL;
gs_free char *fields_str = NULL;
g_return_val_if_fail(NM_IS_SETTING(setting), FALSE);

18
src/nmcli/settings.h
View File

@@ -17,20 +17,20 @@ void nmc_setting_ip6_connect_handlers(NMSettingIPConfig *setting);
void nmc_setting_proxy_connect_handlers(NMSettingProxy *setting);
void nmc_setting_wireless_connect_handlers(NMSettingWireless *setting);
void nmc_setting_connection_connect_handlers(NMSettingConnection *setting,
NMConnection * connection);
NMConnection *connection);
char **nmc_setting_get_valid_properties(NMSetting *setting);
char * nmc_setting_get_property_desc(NMSetting *setting, const char *prop);
char *nmc_setting_get_property_desc(NMSetting *setting, const char *prop);
const char *const *
nmc_setting_get_property_allowed_values(NMSetting *setting, const char *prop, char ***out_to_free);
char * nmc_setting_get_property(NMSetting *setting, const char *prop, GError **error);
char * nmc_setting_get_property_parsable(NMSetting *setting, const char *prop, GError **error);
gboolean nmc_setting_set_property(NMClient * client,
NMSetting * setting,
const char * prop,
char *nmc_setting_get_property(NMSetting *setting, const char *prop, GError **error);
char *nmc_setting_get_property_parsable(NMSetting *setting, const char *prop, GError **error);
gboolean nmc_setting_set_property(NMClient *client,
NMSetting *setting,
const char *prop,
NMMetaAccessorModifier modifier,
const char * val,
GError ** error);
const char *val,
GError **error);
gboolean setting_details(const NmcConfig *nmc_config, NMSetting *setting, const char *one_prop);

174
src/nmcli/utils.c
View File

@@ -40,8 +40,8 @@ _meta_type_nmc_generic_info_get_name(const NMMetaAbstractInfo *abstract_info, gb
static const NMMetaAbstractInfo *const *
_meta_type_nmc_generic_info_get_nested(const NMMetaAbstractInfo *abstract_info,
guint * out_len,
gpointer * out_to_free)
guint *out_len,
gpointer *out_to_free)
{
const NmcMetaGenericInfo *info;
@@ -52,16 +52,16 @@ _meta_type_nmc_generic_info_get_nested(const NMMetaAbstractInfo *abstract_info,
}
static gconstpointer
_meta_type_nmc_generic_info_get_fcn(const NMMetaAbstractInfo * abstract_info,
const NMMetaEnvironment * environment,
_meta_type_nmc_generic_info_get_fcn(const NMMetaAbstractInfo *abstract_info,
const NMMetaEnvironment *environment,
gpointer environment_user_data,
gpointer target,
gpointer target_data,
NMMetaAccessorGetType get_type,
NMMetaAccessorGetFlags get_flags,
NMMetaAccessorGetOutFlags *out_flags,
gboolean * out_is_default,
gpointer * out_to_free)
gboolean *out_is_default,
gpointer *out_to_free)
{
const NmcMetaGenericInfo *info = (const NmcMetaGenericInfo *) abstract_info;
@@ -244,11 +244,11 @@ nmc_arg_is_option(const char *str, const char *opt_name)
* Returns: TRUE on success, FALSE on an error and sets 'error'
*/
gboolean
nmc_parse_args(nmc_arg_t * arg_arr,
nmc_parse_args(nmc_arg_t *arg_arr,
gboolean last,
int * argc,
int *argc,
const char *const **argv,
GError ** error)
GError **error)
{
nmc_arg_t *p;
gboolean found;
@@ -376,7 +376,7 @@ nmc_colorize(const NmcConfig *nmc_config, NMMetaColor color, const char *fmt, ..
{
va_list args;
gs_free char *str = NULL;
const char * ansi_seq = NULL;
const char *ansi_seq = NULL;
va_start(args, fmt);
str = g_strdup_vprintf(fmt, args);
@@ -423,7 +423,7 @@ void
nmc_filter_out_colors_inplace(char *str)
{
const char *p1;
char * p2;
char *p2;
gboolean copy_char = TRUE;
if (!str)
@@ -463,7 +463,7 @@ nmc_filter_out_colors(const char *str)
char *
nmc_get_user_input(const char *ask_str)
{
char * line = NULL;
char *line = NULL;
size_t line_ln = 0;
ssize_t num;
@@ -489,11 +489,11 @@ int
nmc_string_to_arg_array(const char *line,
const char *delim,
gboolean unquote,
char *** argv,
int * argc)
char ***argv,
int *argc)
{
gs_free const char **arr0 = NULL;
char ** arr;
char **arr;
arr0 = nm_strsplit_set(line ?: "", delim ?: " \t");
if (!arr0)
@@ -503,7 +503,7 @@ nmc_string_to_arg_array(const char *line,
if (unquote) {
int i = 0;
char * s;
char *s;
size_t l;
const char *quotes = "\"'";
@@ -658,17 +658,17 @@ typedef struct _PrintDataCol {
} PrintDataCol;
static gboolean
_output_selection_append(GArray * cols,
_output_selection_append(GArray *cols,
guint parent_idx,
const NMMetaSelectionItem *selection_item,
GPtrArray * gfree_keeper,
GError ** error)
GPtrArray *gfree_keeper,
GError **error)
{
gs_free gpointer nested_to_free = NULL;
guint col_idx;
guint i;
const NMMetaAbstractInfo *const *nested;
NMMetaSelectionResultList * selection;
NMMetaSelectionResultList *selection;
col_idx = cols->len;
@@ -787,16 +787,16 @@ _output_selection_complete(GArray *cols)
*/
static gboolean
_output_selection_parse(const NMMetaAbstractInfo *const *fields,
const char * fields_str,
PrintDataCol ** out_cols_data,
guint * out_cols_len,
GPtrArray ** out_gfree_keeper,
GError ** error)
const char *fields_str,
PrintDataCol **out_cols_data,
guint *out_cols_len,
GPtrArray **out_gfree_keeper,
GError **error)
{
NMMetaSelectionResultList *selection;
NMMetaSelectionResultList *selection;
gs_unref_ptrarray GPtrArray *gfree_keeper = NULL;
gs_unref_array GArray *cols = NULL;
guint i;
gs_unref_array GArray *cols = NULL;
guint i;
selection = nm_meta_selection_create_parse_list(fields, fields_str, FALSE, error);
if (!selection)
@@ -853,15 +853,15 @@ _output_selection_parse(const NMMetaAbstractInfo *const *fields,
* Caller is responsible for freeing the array.
*/
GArray *
parse_output_fields(const char * fields_str,
parse_output_fields(const char *fields_str,
const NMMetaAbstractInfo *const *fields_array,
gboolean parse_groups,
GPtrArray ** out_group_fields,
GError ** error)
GPtrArray **out_group_fields,
GError **error)
{
gs_free NMMetaSelectionResultList *selection = NULL;
GArray * array;
GPtrArray * group_fields = NULL;
GArray *array;
GPtrArray *group_fields = NULL;
guint i;
g_return_val_if_fail(!error || !*error, NULL);
@@ -926,7 +926,7 @@ nmc_empty_output_fields(NmcOutputData *output_data)
typedef struct {
guint col_idx;
const PrintDataCol *col;
const char * title;
const char *title;
bool title_to_free : 1;
/* whether the column should be printed. If not %TRUE,
@@ -946,7 +946,7 @@ typedef struct {
const PrintDataHeaderCell *header_cell;
NMMetaColor color;
union {
const char * plain;
const char *plain;
const char *const *strv;
} text;
PrintDataCellFormatType text_format : 3;
@@ -993,16 +993,16 @@ _print_data_cell_clear(gpointer cell_p)
}
static void
_print_fill(const NmcConfig * nmc_config,
gpointer const * targets,
_print_fill(const NmcConfig *nmc_config,
gpointer const *targets,
gpointer targets_data,
const PrintDataCol *cols,
guint cols_len,
GArray ** out_header_row,
GArray ** out_cells)
GArray **out_header_row,
GArray **out_cells)
{
GArray * cells;
GArray * header_row;
GArray *cells;
GArray *header_row;
guint i_row, i_col;
guint targets_len;
NMMetaAccessorGetType text_get_type;
@@ -1012,8 +1012,8 @@ _print_fill(const NmcConfig * nmc_config,
g_array_set_clear_func(header_row, _print_data_header_cell_clear);
for (i_col = 0; i_col < cols_len; i_col++) {
const PrintDataCol * col;
PrintDataHeaderCell * header_cell;
const PrintDataCol *col;
PrintDataHeaderCell *header_cell;
guint col_idx;
const NMMetaAbstractInfo *info;
@@ -1064,9 +1064,9 @@ _print_fill(const NmcConfig * nmc_config,
PrintDataCell *cells_line = &g_array_index(cells, PrintDataCell, i_row * header_row->len);
for (i_col = 0; i_col < header_row->len; i_col++) {
char * to_free = NULL;
PrintDataCell * cell = &cells_line[i_col];
PrintDataHeaderCell * header_cell;
char *to_free = NULL;
PrintDataCell *cell = &cells_line[i_col];
PrintDataHeaderCell *header_cell;
const NMMetaAbstractInfo *info;
NMMetaAccessorGetOutFlags text_out_flags, color_out_flags;
gconstpointer value;
@@ -1155,7 +1155,7 @@ _print_fill(const NmcConfig * nmc_config,
const PrintDataCell *cells_line =
&g_array_index(cells, PrintDataCell, i_row * header_row->len);
const PrintDataCell *cell = &cells_line[i_col];
const char *const * i_strv;
const char *const *i_strv;
switch (cell->text_format) {
case PRINT_DATA_CELL_FORMAT_TYPE_PLAIN:
@@ -1185,7 +1185,7 @@ static gboolean
_print_skip_column(const NmcConfig *nmc_config, const PrintDataHeaderCell *header_cell)
{
const NMMetaSelectionItem *selection_item;
const NMMetaAbstractInfo * info;
const NMMetaAbstractInfo *info;
selection_item = header_cell->col->selection_item;
info = selection_item->info;
@@ -1217,16 +1217,16 @@ _print_skip_column(const NmcConfig *nmc_config, const PrintDataHeaderCell *heade
}
static void
_print_do(const NmcConfig * nmc_config,
const char * header_name_no_l10n,
_print_do(const NmcConfig *nmc_config,
const char *header_name_no_l10n,
guint col_len,
guint row_len,
const PrintDataHeaderCell *header_row,
const PrintDataCell * cells)
const PrintDataCell *cells)
{
int width1, width2;
int table_width = 0;
guint i_row, i_col;
int width1, width2;
int table_width = 0;
guint i_row, i_col;
nm_auto_free_gstring GString *str = NULL;
g_assert(col_len);
@@ -1235,7 +1235,7 @@ _print_do(const NmcConfig * nmc_config,
if (nmc_config->print_output == NMC_PRINT_PRETTY && header_name_no_l10n) {
gs_free char *line = NULL;
int header_width;
const char * header_name = _(header_name_no_l10n);
const char *header_name = _(header_name_no_l10n);
header_width = nmc_string_screen_width(header_name, NULL) + 4;
@@ -1261,7 +1261,7 @@ _print_do(const NmcConfig * nmc_config,
&& !nmc_config->multiline_output) {
for (i_col = 0; i_col < col_len; i_col++) {
const PrintDataHeaderCell *header_cell = &header_row[i_col];
const char * title;
const char *title;
if (_print_skip_column(nmc_config, header_cell))
continue;
@@ -1297,7 +1297,7 @@ _print_do(const NmcConfig * nmc_config,
for (i_col = 0; i_col < col_len; i_col++) {
const PrintDataCell *cell = &current_line[i_col];
const char *const * lines = NULL;
const char *const *lines = NULL;
guint i_lines, lines_len;
if (_print_skip_column(nmc_config, cell->header_cell))
@@ -1318,7 +1318,7 @@ _print_do(const NmcConfig * nmc_config,
for (i_lines = 0; i_lines < lines_len; i_lines++) {
gs_free char *text_to_free = NULL;
const char * text;
const char *text;
text = colorize_string(nmc_config, cell->color, lines[i_lines], &text_to_free);
if (nmc_config->multiline_output) {
@@ -1385,19 +1385,19 @@ _print_do(const NmcConfig * nmc_config,
}
gboolean
nmc_print(const NmcConfig * nmc_config,
gpointer const * targets,
nmc_print(const NmcConfig *nmc_config,
gpointer const *targets,
gpointer targets_data,
const char * header_name_no_l10n,
const char *header_name_no_l10n,
const NMMetaAbstractInfo *const *fields,
const char * fields_str,
GError ** error)
const char *fields_str,
GError **error)
{
gs_unref_ptrarray GPtrArray *gfree_keeper = NULL;
gs_free PrintDataCol *cols_data = NULL;
guint cols_len;
gs_unref_array GArray *header_row = NULL;
gs_unref_array GArray *cells = NULL;
gs_free PrintDataCol *cols_data = NULL;
guint cols_len;
gs_unref_array GArray *header_row = NULL;
gs_unref_array GArray *cells = NULL;
if (!_output_selection_parse(fields, fields_str, &cols_data, &cols_len, &gfree_keeper, error))
return FALSE;
@@ -1528,15 +1528,15 @@ nmc_terminal_spawn_pager(const NmcConfig *nmc_config)
/*****************************************************************************/
static const char *
get_value_to_print(const NmcConfig * nmc_config,
get_value_to_print(const NmcConfig *nmc_config,
const NmcOutputField *field,
gboolean field_name,
const char * not_set_str,
char ** out_to_free)
const char *not_set_str,
char **out_to_free)
{
gboolean is_array = field->value_is_array;
const char * value;
const char * out;
const char *value;
const char *out;
gs_free char *free_value = NULL;
nm_assert(out_to_free && !*out_to_free);
@@ -1569,18 +1569,18 @@ get_value_to_print(const NmcConfig * nmc_config,
* of 'field_values' array.
*/
void
print_required_fields(const NmcConfig * nmc_config,
NmcPagerData * pager_data,
print_required_fields(const NmcConfig *nmc_config,
NmcPagerData *pager_data,
NmcOfFlags of_flags,
const GArray * indices,
const char * header_name,
const GArray *indices,
const char *header_name,
int indent,
const NmcOutputField *field_values)
{
nm_auto_free_gstring GString *str = NULL;
int width1, width2;
int table_width = 0;
const char * not_set_str;
const char *not_set_str;
int i;
gboolean main_header_add = of_flags & NMC_OF_FLAG_MAIN_HEADER_ADD;
gboolean main_header_only = of_flags & NMC_OF_FLAG_MAIN_HEADER_ONLY;
@@ -1635,7 +1635,7 @@ print_required_fields(const NmcConfig * nmc_config,
if (is_array) {
gs_free char *val_to_free = NULL;
const char ** p, *val, *print_val;
const char **p, *val, *print_val;
int j;
/* value is a null-terminated string array */
@@ -1664,9 +1664,9 @@ print_required_fields(const NmcConfig * nmc_config,
} else {
gs_free char *val_to_free = NULL;
gs_free char *tmp = NULL;
const char * hdr_name = (const char *) field_values[0].value;
const char * val = (const char *) field_values[idx].value;
const char * print_val;
const char *hdr_name = (const char *) field_values[0].value;
const char *val = (const char *) field_values[idx].value;
const char *print_val;
/* value is a string */
@@ -1703,7 +1703,7 @@ print_required_fields(const NmcConfig * nmc_config,
for (i = 0; i < indices->len; i++) {
gs_free char *val_to_free = NULL;
int idx;
const char * value;
const char *value;
idx = g_array_index(indices, int, i);
@@ -1782,7 +1782,7 @@ print_data_prepare_width(GPtrArray *output_data)
for (j = 0; j < output_data->len; j++) {
gboolean field_names;
gs_free char *val_to_free = NULL;
const char * value;
const char *value;
row = g_ptr_array_index(output_data, j);
field_names = row[0].flags & NMC_OF_FLAG_FIELD_NAMES;
@@ -1798,10 +1798,10 @@ print_data_prepare_width(GPtrArray *output_data)
}
void
print_data(const NmcConfig * nmc_config,
NmcPagerData * pager_data,
const GArray * indices,
const char * header_name,
print_data(const NmcConfig *nmc_config,
NmcPagerData *pager_data,
const GArray *indices,
const char *header_name,
int indent,
const NmcOutputData *out)
{

54
src/nmcli/utils.h
View File

@@ -11,7 +11,7 @@
/* === Types === */
typedef struct {
const char * name;
const char *name;
gboolean has_value;
const char **value;
gboolean mandatory;
@@ -22,16 +22,16 @@ typedef struct {
int next_arg(NmCli *nmc, int *argc, const char *const **argv, ...);
gboolean nmc_arg_is_help(const char *arg);
gboolean nmc_arg_is_option(const char *arg, const char *opt_name);
gboolean nmc_parse_args(nmc_arg_t * arg_arr,
gboolean nmc_parse_args(nmc_arg_t *arg_arr,
gboolean last,
int * argc,
int *argc,
const char *const **argv,
GError ** error);
char * ssid_to_hex(const char *str, gsize len);
GError **error);
char *ssid_to_hex(const char *str, gsize len);
void nmc_terminal_erase_line(void);
void nmc_terminal_show_progress(const char *str);
pid_t nmc_terminal_spawn_pager(const NmcConfig *nmc_config);
char * nmc_colorize(const NmcConfig *nmc_config, NMMetaColor color, const char *fmt, ...)
char *nmc_colorize(const NmcConfig *nmc_config, NMMetaColor color, const char *fmt, ...)
_nm_printf(3, 4);
void nmc_filter_out_colors_inplace(char *str);
char *nmc_filter_out_colors(const char *str);
@@ -39,8 +39,8 @@ char *nmc_get_user_input(const char *ask_str);
int nmc_string_to_arg_array(const char *line,
const char *delim,
gboolean unquote,
char *** argv,
int * argc);
char ***argv,
int *argc);
char *nmc_util_strv_for_display(const char *const *strv, gboolean brackets);
int nmc_string_screen_width(const char *start, const char *end);
void set_val_str(NmcOutputField fields_array[], guint32 index, char *value);
@@ -50,25 +50,25 @@ void set_val_arrc(NmcOutputField fields_array[], guint32 index, const char **va
void set_val_color_all(NmcOutputField fields_array[], NMMetaColor color);
void nmc_free_output_field_values(NmcOutputField fields_array[]);
GArray * parse_output_fields(const char * fields_str,
GArray *parse_output_fields(const char *fields_str,
const NMMetaAbstractInfo *const *fields_array,
gboolean parse_groups,
GPtrArray ** group_fields,
GError ** error);
GPtrArray **group_fields,
GError **error);
NmcOutputField *nmc_dup_fields_array(const NMMetaAbstractInfo *const *fields, NmcOfFlags flags);
void nmc_empty_output_fields(NmcOutputData *output_data);
void print_required_fields(const NmcConfig * nmc_config,
NmcPagerData * pager_data,
void print_required_fields(const NmcConfig *nmc_config,
NmcPagerData *pager_data,
NmcOfFlags of_flags,
const GArray * indices,
const char * header_name,
const GArray *indices,
const char *header_name,
int indent,
const NmcOutputField *field_values);
void print_data_prepare_width(GPtrArray *output_data);
void print_data(const NmcConfig * nmc_config,
NmcPagerData * pager_data,
const GArray * indices,
const char * header_name,
void print_data(const NmcConfig *nmc_config,
NmcPagerData *pager_data,
const GArray *indices,
const char *header_name,
int indent,
const NmcOutputData *out);
@@ -251,8 +251,8 @@ struct _NmcMetaGenericInfo {
const NMMetaType *meta_type;
};
NmcGenericInfoType info_type;
const char * name;
const char * name_header;
const char *name;
const char *name_header;
const NmcMetaGenericInfo *const *nested;
#define NMC_META_GENERIC_INFO_GET_FCN_ARGS \
@@ -327,7 +327,7 @@ typedef enum {
static inline char *
nmc_meta_generic_get_enum_with_detail(NmcMetaGenericGetEnumType get_enum_type,
gint64 enum_val,
const char * str_val,
const char *str_val,
NMMetaAccessorGetType get_type)
{
if (!NM_IN_SET(get_type, NM_META_ACCESSOR_GET_TYPE_PRETTY, NM_META_ACCESSOR_GET_TYPE_PARSABLE))
@@ -359,13 +359,13 @@ nmc_meta_generic_get_enum_with_detail(NmcMetaGenericGetEnumType get_enum_type,
/*****************************************************************************/
gboolean nmc_print(const NmcConfig * nmc_config,
gpointer const * targets,
gboolean nmc_print(const NmcConfig *nmc_config,
gpointer const *targets,
gpointer targets_data,
const char * header_name_no_l10n,
const char *header_name_no_l10n,
const NMMetaAbstractInfo *const *fields,
const char * fields_str,
GError ** error);
const char *fields_str,
GError **error);
/*****************************************************************************/