shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-08-03 08:22:00 +03:00
Code Releases Activity

cleanup: replace strlen with sizeof

Browse Source 
Use the string size from compile time.
This commit is contained in:
Zdenek Kabelac
2024-05-26 11:47:26 +02:00
parent eaa4882924
commit e1fd179dc5
5 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/label/hints.c
View File

@ -737,7 +737,7 @@ static int _read_hint_file(struct cmd_context *cmd, struct dm_list *hints, int *
* list of devs used by this cmd
*/
keylen = strlen("hints_version:");
keylen = sizeof("hints_version:") - 1;
if (!strncmp(_hint_line, "hints_version:", keylen)) {
if (sscanf(_hint_line + keylen, "%d.%d", &hv_major, &hv_minor) != 2) {
log_debug("ignore hints with unknown version %d.%d", hv_major, hv_minor);
@ -754,7 +754,7 @@ static int _read_hint_file(struct cmd_context *cmd, struct dm_list *hints, int *
continue;
}
keylen = strlen("global_filter:");
keylen = sizeof("global_filter:") - 1;
if (!strncmp(_hint_line, "global_filter:", keylen)) {
_filter_to_str(cmd, devices_global_filter_CFG, &filter_str);
if (!filter_str || strcmp(filter_str, _hint_line + keylen)) {
@ -767,7 +767,7 @@ static int _read_hint_file(struct cmd_context *cmd, struct dm_list *hints, int *
continue;
}
keylen = strlen("filter:");
keylen = sizeof("filter:") - 1;
if (!strncmp(_hint_line, "filter:", keylen)) {
_filter_to_str(cmd, devices_filter_CFG, &filter_str);
if (!filter_str || strcmp(filter_str, _hint_line + keylen)) {
@ -780,7 +780,7 @@ static int _read_hint_file(struct cmd_context *cmd, struct dm_list *hints, int *
continue;
}
keylen = strlen("scan_lvs:");
keylen = sizeof("scan_lvs:") - 1;
if (!strncmp(_hint_line, "scan_lvs:", keylen)) {
unsigned scan_lvs = 0;
if ((sscanf(_hint_line + keylen, "%u", &scan_lvs) != 1) ||
@ -792,7 +792,7 @@ static int _read_hint_file(struct cmd_context *cmd, struct dm_list *hints, int *
continue;
}
keylen = strlen("devices_file:");
keylen = sizeof("devices_file:") - 1;
if (!strncmp(_hint_line, "devices_file:", keylen)) {
const char *df_hint = _hint_line + keylen;
const char *df_config = find_config_tree_str(cmd, devices_devicesfile_CFG, NULL);
@ -811,7 +811,7 @@ static int _read_hint_file(struct cmd_context *cmd, struct dm_list *hints, int *
continue;
}
keylen = strlen("devs_hash:");
keylen = sizeof("devs_hash:") - 1;
if (!strncmp(_hint_line, "devs_hash:", keylen)) {
if (sscanf(_hint_line + keylen, "%u %u", &read_hash, &read_count) != 2) {
log_debug("ignore hints with invalid devs_hash");
@ -824,7 +824,7 @@ static int _read_hint_file(struct cmd_context *cmd, struct dm_list *hints, int *
/*
* Ignore any other line prefixes that we don't recognize.
*/
keylen = strlen("scan:");
keylen = sizeof("scan:") - 1;
if (strncmp(_hint_line, "scan:", keylen))
continue;