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

cli: use const argument for nmc_string_is_valid()

Browse source 
With a const argument, we can make variables static const,
which means the linker loads the memory as read only.

Also, use NM_CAST_STRV_CC() macro, which casts the argument
accordingly.
This commit is contained in:
Thomas Haller 2021-04-27 09:18:00 +02:00
parent bf6214ef32
commit 1f33a59a0f
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
3 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libnmc-base/nm-client-utils.c
View file

@ -175,12 +175,12 @@ nmc_string_to_ternary(const char *str, NMTernary *val, GError **error)
* On failure: error->code : 0 - string not found; 1 - string is ambiguous
*/
const char *
nmc_string_is_valid(const char *input, const char **allowed, GError **error)
_nmc_string_is_valid(const char *input, const char *const *allowed, GError **error)
{
const char **p;
size_t input_ln, p_len;
const char * partial_match = NULL;
gboolean ambiguous = FALSE;
const char *const *p;
size_t input_ln, p_len;
const char * partial_match = NULL;
gboolean ambiguous = FALSE;
g_return_val_if_fail(!error || !*error, NULL);

5
src/libnmc-base/nm-client-utils.h
View file

@ -12,7 +12,10 @@
const NMObject **nmc_objects_sort_by_path(const NMObject *const *objs, gssize len);
const char *nmc_string_is_valid(const char *input, const char **allowed, GError **error);
const char *_nmc_string_is_valid(const char *input, const char *const *allowed, GError **error);
#define nmc_string_is_valid(input, allowed, error) \
_nmc_string_is_valid((input), NM_CAST_STRV_CC(allowed), (error))
gboolean nmc_string_to_uint(const char * str,
gboolean range_check,

33
src/nmcli/utils.h
View file

@ -33,23 +33,22 @@ 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, ...)
_nm_printf(3, 4);
void nmc_filter_out_colors_inplace(char *str);
char * nmc_filter_out_colors(const char *str);
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);
const char *nmc_string_is_valid(const char *input, const char **allowed, GError **error);
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);
void set_val_strc(NmcOutputField fields_array[], guint32 index, const char *value);
void set_val_arr(NmcOutputField fields_array[], guint32 index, char **value);
void set_val_arrc(NmcOutputField fields_array[], guint32 index, const char **value);
void set_val_color_all(NmcOutputField fields_array[], NMMetaColor color);
void nmc_free_output_field_values(NmcOutputField fields_array[]);
void nmc_filter_out_colors_inplace(char *str);
char *nmc_filter_out_colors(const char *str);
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 *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);
void set_val_strc(NmcOutputField fields_array[], guint32 index, const char *value);
void set_val_arr(NmcOutputField fields_array[], guint32 index, char **value);
void set_val_arrc(NmcOutputField fields_array[], guint32 index, const char **value);
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,
const NMMetaAbstractInfo *const *fields_array,