From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 21 Nov 2025 08:25:18 +0000 (+0100)
Subject: tree-wide: sizeof() fixes
X-Git-Tag: v259-rc2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33b0642e6ad33057a9f56763008e565d936d3948;p=thirdparty%2Fsystemd.git

tree-wide: sizeof() fixes

- TIME_T_MAX is always time_t so the check in time-util.c was redundant
- quota-util.c was zero-ing a pointer
- smbios11.c was calling sizeof(pointer)
---

diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 62f1fcaed83..70fd5835c3f 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -1805,8 +1805,6 @@ int time_change_fd(void) {
 
         _cleanup_close_ int fd = -EBADF;
 
-        assert_cc(sizeof(time_t) == sizeof(TIME_T_MAX));
-
         /* Uses TFD_TIMER_CANCEL_ON_SET to get notifications whenever CLOCK_REALTIME makes a jump relative to
          * CLOCK_MONOTONIC. */
 
diff --git a/src/shared/quota-util.c b/src/shared/quota-util.c
index 265d5029717..0a7d9bf38a9 100644
--- a/src/shared/quota-util.c
+++ b/src/shared/quota-util.c
@@ -42,7 +42,7 @@ int quota_query_proj_id(int fd, uint32_t proj_id, struct dqblk *ret_req) {
 
         r = quotactl_fd_with_fallback(fd, QCMD_FIXED(Q_GETQUOTA, PRJQUOTA), proj_id, ret_req);
         if (r == -ESRCH || ERRNO_IS_NEG_NOT_SUPPORTED(r) || ERRNO_IS_NEG_PRIVILEGE(r)) {
-                zero(ret_req);
+                *ret_req = (struct dqblk) {};
                 return false;
         }
         if (r < 0)
diff --git a/src/shared/smbios11.c b/src/shared/smbios11.c
index 1c6968d21fc..28cc29ee468 100644
--- a/src/shared/smbios11.c
+++ b/src/shared/smbios11.c
@@ -40,7 +40,7 @@ int read_smbios11_field(unsigned i, size_t max_size, char **ret_data, size_t *re
                         AT_FDCWD, p,
                         /* offset = */ UINT64_MAX,
                         max_size >= SIZE_MAX - offsetof(struct dmi_field_header, contents) ? SIZE_MAX :
-                        sizeof(dmi_field_header) + max_size,
+                        sizeof(struct dmi_field_header) + max_size,
                         /* flags = */ 0,
                         /* bind_name = */ NULL,
                         (char**) &data, &size);