summaryrefslogtreecommitdiffstats
path: root/src/udev/scsi_id
diff options
context:
space:
mode:
authorMike Yuan <me@yhndnzj.com>2024-03-03 11:13:52 +0100
committerMike Yuan <me@yhndnzj.com>2024-03-03 12:01:00 +0100
commit4f49512695f8214c55c206b3c2f583dc7b309e1b (patch)
tree70c9ea001721617aa281e79d3aa6a0770bccf5e6 /src/udev/scsi_id
parentcore/service: minor cleanup for service_add_fd_store (diff)
downloadsystemd-4f49512695f8214c55c206b3c2f583dc7b309e1b.tar.xz
systemd-4f49512695f8214c55c206b3c2f583dc7b309e1b.zip
extract-word: modernize extract_many_words
Diffstat (limited to 'src/udev/scsi_id')
-rw-r--r--src/udev/scsi_id/scsi_id.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c
index d7d4380851..0f7119cd70 100644
--- a/src/udev/scsi_id/scsi_id.c
+++ b/src/udev/scsi_id/scsi_id.c
@@ -151,7 +151,7 @@ static int get_file_options(const char *vendor, const char *model,
if (*buf == '#')
continue;
- r = extract_many_words(&buf, "=\",\n", 0, &key, &value, NULL);
+ r = extract_many_words(&buf, "=\",\n", 0, &key, &value);
if (r < 2)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Error parsing config file line %d '%s'", lineno, buffer);
@@ -159,7 +159,7 @@ static int get_file_options(const char *vendor, const char *model,
vendor_in = TAKE_PTR(value);
key = mfree(key);
- r = extract_many_words(&buf, "=\",\n", 0, &key, &value, NULL);
+ r = extract_many_words(&buf, "=\",\n", 0, &key, &value);
if (r < 2)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Error parsing config file line %d '%s'", lineno, buffer);
@@ -167,7 +167,7 @@ static int get_file_options(const char *vendor, const char *model,
model_in = TAKE_PTR(value);
key = mfree(key);
- r = extract_many_words(&buf, "=\",\n", 0, &key, &value, NULL);
+ r = extract_many_words(&buf, "=\",\n", 0, &key, &value);
if (r < 2)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Error parsing config file line %d '%s'", lineno, buffer);
}