summaryrefslogtreecommitdiff
path: root/extras/scsi_id
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-05-20 17:57:52 +0200
committerKay Sievers <kay.sievers@vrfy.org>2009-05-20 17:57:52 +0200
commit065db052211d3bf08d9b0f698a79a8798faf11d2 (patch)
tree970ac911636e2711c99ab050a7fd341e95ea08a9 /extras/scsi_id
parentf58a9099bb2b18f3f683615324a4382b95446305 (diff)
use more efficient string copying
Diffstat (limited to 'extras/scsi_id')
-rw-r--r--extras/scsi_id/scsi_id.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index d630cf902b..213a267afa 100644
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -105,7 +105,7 @@ static void set_type(const char *from, char *to, size_t len)
break;
}
}
- util_strlcpy(to, type, len);
+ util_strscpy(to, len, type);
}
/*
@@ -354,7 +354,7 @@ static int set_options(struct udev *udev,
case 'd':
dev_specified = 1;
- util_strlcpy(maj_min_dev, optarg, MAX_PATH_LEN);
+ util_strscpy(maj_min_dev, MAX_PATH_LEN, optarg);
break;
case 'e':
@@ -362,7 +362,7 @@ static int set_options(struct udev *udev,
break;
case 'f':
- util_strlcpy(config_file, optarg, MAX_PATH_LEN);
+ util_strscpy(config_file, MAX_PATH_LEN, optarg);
break;
case 'g':
@@ -428,7 +428,7 @@ static int set_options(struct udev *udev,
}
if (optind < argc && !dev_specified) {
dev_specified = 1;
- util_strlcpy(maj_min_dev, argv[optind], MAX_PATH_LEN);
+ util_strscpy(maj_min_dev, MAX_PATH_LEN, argv[optind]);
}
return 0;
}