diff options
Diffstat (limited to 'src/devices/rfkill.cpp')
-rw-r--r-- | src/devices/rfkill.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/devices/rfkill.cpp b/src/devices/rfkill.cpp index 7dea12e..2115b5b 100644 --- a/src/devices/rfkill.cpp +++ b/src/devices/rfkill.cpp @@ -52,21 +52,21 @@ rfkill::rfkill(char *_name, char *path): device() end_hard = 0; strncpy(sysfs_path, path, sizeof(sysfs_path)); register_sysfs_path(sysfs_path); - snprintf(devname, 128, "radio:%s", _name); - snprintf(humanname, 4096, "radio:%s", _name); + snprintf(devname, sizeof(devname), "radio:%s", _name); + snprintf(humanname, sizeof(humanname), "radio:%s", _name); strncpy(name, devname, sizeof(name)); register_parameter(devname); index = get_param_index(devname); rindex = get_result_index(name); memset(line, 0, 4096); - snprintf(filename, PATH_MAX, "%s/device/driver", path); - if (readlink(filename, line, 4096) > 0) { - snprintf(humanname, 4096, _("Radio device: %s"), basename(line)); + snprintf(filename, sizeof(filename), "%s/device/driver", path); + if (readlink(filename, line, sizeof(line)) > 0) { + snprintf(humanname, sizeof(humanname), _("Radio device: %s"), basename(line)); } - snprintf(filename, PATH_MAX, "%s/device/device/driver", path); - if (readlink(filename, line, 4096) > 0) { - snprintf(humanname, 4096, _("Radio device: %s"), basename(line)); + snprintf(filename, sizeof(filename), "%s/device/device/driver", path); + if (readlink(filename, line, sizeof(line)) > 0) { + snprintf(humanname, sizeof(humanname), _("Radio device: %s"), basename(line)); } } @@ -80,14 +80,14 @@ void rfkill::start_measurement(void) end_hard = 1; end_soft = 1; - snprintf(filename, PATH_MAX, "%s/hard", sysfs_path); + snprintf(filename, sizeof(filename), "%s/hard", sysfs_path); file.open(filename, ios::in); if (file) { file >> start_hard; } file.close(); - snprintf(filename, PATH_MAX, "%s/soft", sysfs_path); + snprintf(filename, sizeof(filename), "%s/soft", sysfs_path); file.open(filename, ios::in); if (file) { file >> start_soft; @@ -100,13 +100,13 @@ void rfkill::end_measurement(void) char filename[PATH_MAX]; ifstream file; - snprintf(filename, PATH_MAX, "%s/hard", sysfs_path); + snprintf(filename, sizeof(filename), "%s/hard", sysfs_path); file.open(filename, ios::in); if (file) { file >> end_hard; } file.close(); - snprintf(filename, PATH_MAX, "%s/soft", sysfs_path); + snprintf(filename, sizeof(filename), "%s/soft", sysfs_path); file.open(filename, ios::in); if (file) { file >> end_soft; @@ -143,15 +143,15 @@ static void create_all_rfkills_callback(const char *d_name) class rfkill *bl; ifstream file; - snprintf(filename, PATH_MAX, "/sys/class/rfkill/%s/name", d_name); - strncpy(name, d_name, 4095); + snprintf(filename, sizeof(filename), "/sys/class/rfkill/%s/name", d_name); + strncpy(name, d_name, sizeof(name) - 1); file.open(filename, ios::in); if (file) { file.getline(name, 100); file.close(); } - snprintf(filename, PATH_MAX, "/sys/class/rfkill/%s", d_name); + snprintf(filename, sizeof(filename), "/sys/class/rfkill/%s", d_name); bl = new class rfkill(name, filename); all_devices.push_back(bl); } |