Skip to content

Multiple printf() size fixes #17199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Apr 1, 2025
Merged

Multiple printf() size fixes #17199

merged 1 commit into from
Apr 1, 2025

Conversation

mmatuska
Copy link
Contributor

Motivation and Context

When compiling on i386, multiple printf() calls incorrectly size variables

Description

cmd/zinject/zinject.c:

  • use PRIu64 when printing uint64_t

tests/zfs-tests/cmd/clonefile.c:

  • use an unsigned long long and not size_t to store result from strtoull()
  • use %jd for printing off_t, %zu for size_t, %zd for ssize_t

tests/zfs-tests/tests/functional/vdev_disk/page_alignment.c:

  • use %zx to print size_t

How Has This Been Tested?

Tested compiling on Linux amd64, FreeBSD amd64 and FreeBSD i386

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

Checklist:

robn
robn approved these changes Mar 30, 2025
View reviewed changes
Copy link
Member

@robn robn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works for me (and til %j). Thanks!

amotin
amotin requested changes Mar 31, 2025
View reviewed changes
Copy link
Member

@amotin amotin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"error: commit message body contains line over 72 characters", plus below:

@amotin amotin added the Status: Revision Needed Changes are required for the PR to be accepted label Mar 31, 2025
@mmatuska
Multiple printf() size fixes
d9f435c 
cmd/zinject/zinject.c:
 - use PRIu64 when printing uint64_t

tests/zfs-tests/cmd/clonefile.c:
 - use an unsigned long long to store result from strtoull()
 - use %jd for printing off_t, %zu for size_t, %zd for ssize_t

tests/zfs-tests/tests/functional/vdev_disk/page_alignment.c:
 - use %zx to print size_t

Discovered when compiling on FreeBSD i386.

Signed-off-by: Martin Matuska <[email protected]>
@github-actions github-actions bot removed the Status: Revision Needed Changes are required for the PR to be accepted label Mar 31, 2025
allanjude
allanjude reviewed Apr 1, 2025
View reviewed changes
cmd/zinject/zinject.c
@@ -491,7 +492,8 @@ print_device_handler(int id, const char *pool, zinject_record_t *record,
(((double)record->zi_freq) / ZI_PERCENTAGE_MAX) * 100.0f;

(void) printf("%3d %-15s %llx %-5s %-10s %8.4f%% "
"%6lu %6lu\n", id, pool, (u_longlong_t)record->zi_guid,
"%6" PRIu64 " %6" PRIu64 "\n", id, pool,
(u_longlong_t)record->zi_guid,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should zi_guid not also be a PRIu64? and zi_objset and zi_object above?

@amotin amotin added the Status: Accepted Ready to integrate (reviewed, tested) label Apr 1, 2025
@tonyhutter tonyhutter merged commit 87f8bf6 into openzfs:master Apr 1, 2025
21 of 23 checks passed
robn pushed a commit to robn/zfs that referenced this pull request Apr 4, 2025
@mmatuska @robn
Multiple printf() size fixes (openzfs#17199)
0d13ca8 
cmd/zinject/zinject.c:
 - use PRIu64 when printing uint64_t

tests/zfs-tests/cmd/clonefile.c:
 - use an unsigned long long to store result from strtoull()
 - use %jd for printing off_t, %zu for size_t, %zd for ssize_t

tests/zfs-tests/tests/functional/vdev_disk/page_alignment.c:
 - use %zx to print size_t

Discovered when compiling on FreeBSD i386.

Signed-off-by: Martin Matuska <[email protected]>

Reviewed-by: Rob Norris <[email protected]>
Reviewed-by: Alexander Motin <[email protected]>
Reviewed-by: Allan Jude <[email protected]>
Reviewed-by: @ImAwsumm
(cherry picked from commit 87f8bf6)
@mmatuska mmatuska mentioned this pull request Apr 6, 2025
Merged
13 tasks
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Apr 8, 2025
@mmatuska @tonyhutter
Multiple printf() size fixes (openzfs#17199)
d397957 
cmd/zinject/zinject.c:
 - use PRIu64 when printing uint64_t

tests/zfs-tests/cmd/clonefile.c:
 - use an unsigned long long to store result from strtoull()
 - use %jd for printing off_t, %zu for size_t, %zd for ssize_t

tests/zfs-tests/tests/functional/vdev_disk/page_alignment.c:
 - use %zx to print size_t

Discovered when compiling on FreeBSD i386.

Signed-off-by: Martin Matuska <[email protected]>

Reviewed-by: Rob Norris <[email protected]>
Reviewed-by: Alexander Motin <[email protected]>
Reviewed-by: Allan Jude <[email protected]>
Reviewed-by: @ImAwsumm
fuporovvStack pushed a commit to fuporovvStack/zfs that referenced this pull request Apr 11, 2025
@mmatuska @FedorUporovVstack
Multiple printf() size fixes (openzfs#17199)
e987547 
cmd/zinject/zinject.c:
 - use PRIu64 when printing uint64_t

tests/zfs-tests/cmd/clonefile.c:
 - use an unsigned long long to store result from strtoull()
 - use %jd for printing off_t, %zu for size_t, %zd for ssize_t

tests/zfs-tests/tests/functional/vdev_disk/page_alignment.c:
 - use %zx to print size_t

Discovered when compiling on FreeBSD i386.

Signed-off-by: Martin Matuska <[email protected]>

Reviewed-by: Rob Norris <[email protected]>
Reviewed-by: Alexander Motin <[email protected]>
Reviewed-by: Allan Jude <[email protected]>
Reviewed-by: @ImAwsumm
fuporovvStack pushed a commit to fuporovvStack/zfs that referenced this pull request Apr 11, 2025
@mmatuska @FedorUporovVstack
Multiple printf() size fixes (openzfs#17199)
9036dc3 
cmd/zinject/zinject.c:
 - use PRIu64 when printing uint64_t

tests/zfs-tests/cmd/clonefile.c:
 - use an unsigned long long to store result from strtoull()
 - use %jd for printing off_t, %zu for size_t, %zd for ssize_t

tests/zfs-tests/tests/functional/vdev_disk/page_alignment.c:
 - use %zx to print size_t

Discovered when compiling on FreeBSD i386.

Signed-off-by: Martin Matuska <[email protected]>

Reviewed-by: Rob Norris <[email protected]>
Reviewed-by: Alexander Motin <[email protected]>
Reviewed-by: Allan Jude <[email protected]>
Reviewed-by: @ImAwsumm
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Apr 16, 2025
@mmatuska @tonyhutter
Multiple printf() size fixes (openzfs#17199)
5fb1d52 
cmd/zinject/zinject.c:
 - use PRIu64 when printing uint64_t

tests/zfs-tests/cmd/clonefile.c:
 - use an unsigned long long to store result from strtoull()
 - use %jd for printing off_t, %zu for size_t, %zd for ssize_t

tests/zfs-tests/tests/functional/vdev_disk/page_alignment.c:
 - use %zx to print size_t

Discovered when compiling on FreeBSD i386.

Signed-off-by: Martin Matuska <[email protected]>

Reviewed-by: Rob Norris <[email protected]>
Reviewed-by: Alexander Motin <[email protected]>
Reviewed-by: Allan Jude <[email protected]>
Reviewed-by: @ImAwsumm
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@robn robn robn approved these changes

@allanjude allanjude allanjude approved these changes

@amotin amotin amotin approved these changes

@ImAwsumm ImAwsumm ImAwsumm approved these changes

Assignees
No one assigned
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@mmatuska @robn @allanjude @amotin @ImAwsumm @tonyhutter