shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-31 07:51:21 +03:00
Code

Replace use of snprintf with xsprintf

Browse Source
This commit is contained in:
Daniel Lockyer 2017-11-24 10:36:04 +00:00
parent f9ecfd3bbe
commit a7419dbc59
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/basic/log.c
View File

@ -359,7 +359,7 @@ static int write_to_console(
highlight = LOG_PRI(level) <= LOG_ERR && show_color; highlight = LOG_PRI(level) <= LOG_ERR && show_color;
if (show_location) { if (show_location) {
snprintf(location, sizeof(location), "(%s:%i) ", file, line); xsprintf(location, "(%s:%i) ", file, line);
iovec[n++] = IOVEC_MAKE_STRING(location); iovec[n++] = IOVEC_MAKE_STRING(location);
} }
@ -798,7 +798,7 @@ static void log_assert(
return; return;
DISABLE_WARNING_FORMAT_NONLITERAL; DISABLE_WARNING_FORMAT_NONLITERAL;
snprintf(buffer, sizeof buffer, format, text, file, line, func); xsprintf(buffer, format, text, file, line, func);
REENABLE_WARNING; REENABLE_WARNING;
log_abort_msg = buffer; log_abort_msg = buffer;

2
src/core/job.c
View File

@ -777,7 +777,7 @@ static void job_log_status_message(Unit *u, JobType t, JobResult result) {
/* The description might be longer than the buffer, but that's OK, we'll just truncate it here */ /* The description might be longer than the buffer, but that's OK, we'll just truncate it here */
DISABLE_WARNING_FORMAT_NONLITERAL; DISABLE_WARNING_FORMAT_NONLITERAL;
snprintf(buf, sizeof(buf), format, unit_description(u)); xsprintf(buf, format, unit_description(u));
REENABLE_WARNING; REENABLE_WARNING;
switch (t) { switch (t) {

2
src/core/unit.c
View File

@ -1680,7 +1680,7 @@ static void unit_status_log_starting_stopping_reloading(Unit *u, JobType t) {
format = unit_get_status_message_format(u, t); format = unit_get_status_message_format(u, t);
DISABLE_WARNING_FORMAT_NONLITERAL; DISABLE_WARNING_FORMAT_NONLITERAL;
snprintf(buf, sizeof buf, format, unit_description(u)); xsprintf(buf, format, unit_description(u));
REENABLE_WARNING; REENABLE_WARNING;
mid = t == JOB_START ? "MESSAGE_ID=" SD_MESSAGE_UNIT_STARTING_STR : mid = t == JOB_START ? "MESSAGE_ID=" SD_MESSAGE_UNIT_STARTING_STR :

2
src/udev/collect/collect.c
View File

@ -94,7 +94,7 @@ static int prepare(char *dir, char *filename)
if (r < 0 && errno != EEXIST) if (r < 0 && errno != EEXIST)
return -errno; return -errno;
snprintf(buf, sizeof buf, "%s/%s", dir, filename); xsprintf(buf, "%s/%s", dir, filename);
fd = open(buf, O_RDWR|O_CREAT|O_CLOEXEC, S_IRUSR|S_IWUSR); fd = open(buf, O_RDWR|O_CREAT|O_CLOEXEC, S_IRUSR|S_IWUSR);
if (fd < 0) if (fd < 0)

4
src/udev/udev-builtin-net_id.c
View File

@ -275,7 +275,7 @@ static int dev_pci_slot(struct udev_device *dev, struct netnames *names) {
goto out; goto out;
} }
snprintf(slots, sizeof slots, "%s/slots", udev_device_get_syspath(pci)); xsprintf(slots, "%s/slots", udev_device_get_syspath(pci));
dir = opendir(slots); dir = opendir(slots);
if (!dir) { if (!dir) {
err = -errno; err = -errno;
@ -294,7 +294,7 @@ static int dev_pci_slot(struct udev_device *dev, struct netnames *names) {
if (i < 1) if (i < 1)
continue; continue;
snprintf(str, sizeof str, "%s/%s/address", slots, dent->d_name); xsprintf(str, "%s/%s/address", slots, dent->d_name);
if (read_one_line_file(str, &address) >= 0) { if (read_one_line_file(str, &address) >= 0) {
/* match slot address with device by stripping the function */ /* match slot address with device by stripping the function */
if (strneq(address, udev_device_get_sysname(names->pcidev), strlen(address))) if (strneq(address, udev_device_get_sysname(names->pcidev), strlen(address)))