Instead of duplicating their lengths in read/snprintf/...
calls.
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
char buf[INTTYPE_TO_STRLEN(int)];
again:
- n = read(fd, buf, INTTYPE_TO_STRLEN(int));
+ n = read(fd, buf, sizeof(buf));
if (n < 0 && errno == EINTR) {
goto again;
} else if (n >= 0) {
if (!is_set(i, bitarr))
continue;
- ret = snprintf(numstr, INTTYPE_TO_STRLEN(size_t), "%zu", i);
- if (ret < 0 || (size_t)ret >= INTTYPE_TO_STRLEN(size_t)) {
+ ret = snprintf(numstr, sizeof(numstr), "%zu", i);
+ if (ret < 0 || (size_t)ret >= sizeof(numstr)) {
lxc_free_array((void **)cpulist, free);
return NULL;
}
seconds = (time->tv_sec - d_in_s - h_in_s - (minutes * 60));
/* Make string from nanoseconds. */
- ret = snprintf(nanosec, INTTYPE_TO_STRLEN(int64_t), "%"PRId64, (int64_t)time->tv_nsec);
- if (ret < 0 || ret >= INTTYPE_TO_STRLEN(int64_t))
+ ret = snprintf(nanosec, sizeof(nanosec), "%"PRId64, (int64_t)time->tv_nsec);
+ if (ret < 0 || ret >= sizeof(nanosec))
return -1;
/* Create final timestamp for the log and shorten nanoseconds to 3
int ret, w;
char pidstr[INTTYPE_TO_STRLEN(int)];
- w = snprintf(pidstr, INTTYPE_TO_STRLEN(int), "%d", (int)lxc_raw_getpid());
- if (w < 0 || (size_t)w >= INTTYPE_TO_STRLEN(int)) {
+ w = snprintf(pidstr, sizeof(pidstr), "%d", (int)lxc_raw_getpid());
+ if (w < 0 || (size_t)w >= sizeof(pidstr)) {
free_init_cmd(init_cmd);
lxc_free_handler(handler);
close(pipefd[0]);
- ret = snprintf(pipefd_str, INTTYPE_TO_STRLEN(int), "%d", pipefd[1]);
- if (ret < 0 || ret >= INTTYPE_TO_STRLEN(int)) {
+ ret = snprintf(pipefd_str, sizeof(pipefd_str), "%d", pipefd[1]);
+ if (ret < 0 || ret >= sizeof(pipefd_str)) {
ERROR("Failed to create pid argument to pass to monitord.");
_exit(EXIT_FAILURE);
}
close(pipefd[0]);
- ret = snprintf(pipefd_str, INTTYPE_TO_STRLEN(int), "%d", pipefd[1]);
- if (ret < 0 || ret >= INTTYPE_TO_STRLEN(int)) {
+ ret = snprintf(pipefd_str, sizeof(pipefd_str), "%d", pipefd[1]);
+ if (ret < 0 || ret >= sizeof(pipefd_str)) {
ERROR("Failed to create pid argument to pass to monitord");
_exit(EXIT_FAILURE);
}
return -1;
}
- linklen = readlink(path, link, INTTYPE_TO_STRLEN(pid_t));
+ linklen = readlink(path, link, sizeof(link));
ret = snprintf(path, MAXPATHLEN, "%s/proc", rootfs);
if (ret < 0 || ret >= MAXPATHLEN) {
return -1;
goto domount;
- } else if (linklen >= INTTYPE_TO_STRLEN(pid_t)) {
+ } else if (linklen >= sizeof(link)) {
link[linklen - 1] = '\0';
ERROR("readlink returned truncated content: \"%s\"", link);
return -1;
lxc_test_assert_abort((-EINVAL == lxc_safe_uint(" -123", &n)));
lxc_test_assert_abort((-EINVAL == lxc_safe_uint("-123", &n)));
- ret = snprintf(numstr, INTTYPE_TO_STRLEN(uint64_t), "%" PRIu64, (uint64_t)UINT_MAX);
- if (ret < 0 || ret >= INTTYPE_TO_STRLEN(uint64_t))
+ ret = snprintf(numstr, sizeof(numstr), "%" PRIu64, (uint64_t)UINT_MAX);
+ if (ret < 0 || ret >= sizeof(numstr))
exit(EXIT_FAILURE);
lxc_test_assert_abort((0 == lxc_safe_uint(numstr, &n)) && n == UINT_MAX);
- ret = snprintf(numstr, INTTYPE_TO_STRLEN(uint64_t), "%" PRIu64, (uint64_t)UINT_MAX + 1);
- if (ret < 0 || ret >= INTTYPE_TO_STRLEN(uint64_t))
+ ret = snprintf(numstr, sizeof(numstr), "%" PRIu64, (uint64_t)UINT_MAX + 1);
+ if (ret < 0 || ret >= sizeof(numstr))
exit(EXIT_FAILURE);
lxc_test_assert_abort((-ERANGE == lxc_safe_uint(numstr, &n)));
signed int n;
char numstr[INTTYPE_TO_STRLEN(uint64_t)];
- ret = snprintf(numstr, INTTYPE_TO_STRLEN(uint64_t), "%" PRIu64, (uint64_t)INT_MAX);
- if (ret < 0 || ret >= INTTYPE_TO_STRLEN(uint64_t))
+ ret = snprintf(numstr, sizeof(numstr), "%" PRIu64, (uint64_t)INT_MAX);
+ if (ret < 0 || ret >= sizeof(numstr))
exit(EXIT_FAILURE);
lxc_test_assert_abort((0 == lxc_safe_int(numstr, &n)) && n == INT_MAX);
- ret = snprintf(numstr, INTTYPE_TO_STRLEN(uint64_t), "%" PRIu64, (uint64_t)INT_MAX + 1);
- if (ret < 0 || ret >= INTTYPE_TO_STRLEN(uint64_t))
+ ret = snprintf(numstr, sizeof(numstr), "%" PRIu64, (uint64_t)INT_MAX + 1);
+ if (ret < 0 || ret >= sizeof(numstr))
exit(EXIT_FAILURE);
lxc_test_assert_abort((-ERANGE == lxc_safe_int(numstr, &n)));
- ret = snprintf(numstr, INTTYPE_TO_STRLEN(int64_t), "%" PRId64, (int64_t)INT_MIN);
- if (ret < 0 || ret >= INTTYPE_TO_STRLEN(int64_t))
+ ret = snprintf(numstr, sizeof(numstr), "%" PRId64, (int64_t)INT_MIN);
+ if (ret < 0 || ret >= sizeof(numstr))
exit(EXIT_FAILURE);
lxc_test_assert_abort((0 == lxc_safe_int(numstr, &n)) && n == INT_MIN);
- ret = snprintf(numstr, INTTYPE_TO_STRLEN(int64_t), "%" PRId64, (int64_t)INT_MIN - 1);
- if (ret < 0 || ret >= INTTYPE_TO_STRLEN(int64_t))
+ ret = snprintf(numstr, sizeof(numstr), "%" PRId64, (int64_t)INT_MIN - 1);
+ if (ret < 0 || ret >= sizeof(numstr))
exit(EXIT_FAILURE);
lxc_test_assert_abort((-ERANGE == lxc_safe_int(numstr, &n)));