shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

const: libdm tok_op

Browse Source
This commit is contained in:
Zdenek Kabelac 2024-05-03 12:58:40 +02:00
parent eae0314b55
commit 9247e754fe
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
device_mapper/libdm-report.c
View File

@ -153,7 +153,7 @@ struct op_def {
* shorter one if one is a prefix of another! * shorter one if one is a prefix of another!
* (e.g. =~ comes before =) * (e.g. =~ comes before =)
*/ */
static struct op_def _op_cmp[] = { static const struct op_def _op_cmp[] = {
{ "=~", FLD_CMP_REGEX, "Matching regular expression. [regex]" }, { "=~", FLD_CMP_REGEX, "Matching regular expression. [regex]" },
{ "!~", FLD_CMP_REGEX|FLD_CMP_NOT, "Not matching regular expression. [regex]" }, { "!~", FLD_CMP_REGEX|FLD_CMP_NOT, "Not matching regular expression. [regex]" },
{ "=", FLD_CMP_EQUAL, "Equal to. [number, size, percent, string, string list, time]" }, { "=", FLD_CMP_EQUAL, "Equal to. [number, size, percent, string, string list, time]" },
@ -187,7 +187,7 @@ static struct op_def _op_cmp[] = {
#define SEL_LIST_SUBSET_LS 0x00040000 #define SEL_LIST_SUBSET_LS 0x00040000
#define SEL_LIST_SUBSET_LE 0x00080000 #define SEL_LIST_SUBSET_LE 0x00080000
static struct op_def _op_log[] = { static const struct op_def _op_log[] = {
{ "&&", SEL_AND, "All fields must match" }, { "&&", SEL_AND, "All fields must match" },
{ ",", SEL_AND, "All fields must match" }, { ",", SEL_AND, "All fields must match" },
{ "||", SEL_OR, "At least one field must match" }, { "||", SEL_OR, "At least one field must match" },
@ -2261,7 +2261,7 @@ static const char * _skip_space(const char *s)
return s; return s;
} }
static int _tok_op(struct op_def *t, const char *s, const char **end, static int _tok_op(const struct op_def *t, const char *s, const char **end,
uint32_t expect) uint32_t expect)
{ {
size_t len; size_t len;
@ -3751,7 +3751,7 @@ static struct selection_node *_alloc_selection_node(struct dm_pool *mem, uint32_
static void _display_selection_help(struct dm_report *rh) static void _display_selection_help(struct dm_report *rh)
{ {
static const char _grow_object_failed_msg[] = "_display_selection_help: dm_pool_grow_object failed"; static const char _grow_object_failed_msg[] = "_display_selection_help: dm_pool_grow_object failed";
struct op_def *t; const struct op_def *t;
const struct dm_report_reserved_value *rv; const struct dm_report_reserved_value *rv;
size_t len_all, len_final = 0; size_t len_all, len_final = 0;
const char **rvs; const char **rvs;

8
libdm/libdm-report.c
View File

@ -152,7 +152,7 @@ struct op_def {
* shorter one if one is a prefix of another! * shorter one if one is a prefix of another!
* (e.g. =~ comes before =) * (e.g. =~ comes before =)
*/ */
static struct op_def _op_cmp[] = { static const struct op_def _op_cmp[] = {
{ "=~", FLD_CMP_REGEX, "Matching regular expression. [regex]" }, { "=~", FLD_CMP_REGEX, "Matching regular expression. [regex]" },
{ "!~", FLD_CMP_REGEX|FLD_CMP_NOT, "Not matching regular expression. [regex]" }, { "!~", FLD_CMP_REGEX|FLD_CMP_NOT, "Not matching regular expression. [regex]" },
{ "=", FLD_CMP_EQUAL, "Equal to. [number, size, percent, string, string list, time]" }, { "=", FLD_CMP_EQUAL, "Equal to. [number, size, percent, string, string list, time]" },
@ -186,7 +186,7 @@ static struct op_def _op_cmp[] = {
#define SEL_LIST_SUBSET_LS 0x00040000 #define SEL_LIST_SUBSET_LS 0x00040000
#define SEL_LIST_SUBSET_LE 0x00080000 #define SEL_LIST_SUBSET_LE 0x00080000
static struct op_def _op_log[] = { static const struct op_def _op_log[] = {
{ "&&", SEL_AND, "All fields must match" }, { "&&", SEL_AND, "All fields must match" },
{ ",", SEL_AND, "All fields must match" }, { ",", SEL_AND, "All fields must match" },
{ "||", SEL_OR, "At least one field must match" }, { "||", SEL_OR, "At least one field must match" },
@ -2259,7 +2259,7 @@ static const char * _skip_space(const char *s)
return s; return s;
} }
static int _tok_op(struct op_def *t, const char *s, const char **end, static int _tok_op(const struct op_def *t, const char *s, const char **end,
uint32_t expect) uint32_t expect)
{ {
size_t len; size_t len;
@ -3749,7 +3749,7 @@ static struct selection_node *_alloc_selection_node(struct dm_pool *mem, uint32_
static void _display_selection_help(struct dm_report *rh) static void _display_selection_help(struct dm_report *rh)
{ {
static const char _grow_object_failed_msg[] = "_display_selection_help: dm_pool_grow_object failed"; static const char _grow_object_failed_msg[] = "_display_selection_help: dm_pool_grow_object failed";
struct op_def *t; const struct op_def *t;
const struct dm_report_reserved_value *rv; const struct dm_report_reserved_value *rv;
size_t len_all, len_final = 0; size_t len_all, len_final = 0;
const char **rvs; const char **rvs;