This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=0c03bccd406f56ec186d07c9f21f6e03d23fb6ad commit 0c03bccd406f56ec186d07c9f21f6e03d23fb6ad Author: Guillem Jover <[email protected]> AuthorDate: Tue Jan 23 12:30:10 2024 +0100 dpkg-deb: Rename r variable for fd_read() return value to nread This makes it clear we are interested in the amount read instead of using the generic r name. We cannot use the usual «n» as that is already used by the variable denoting the amount to read. Changelog: internal --- src/deb/extract.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/deb/extract.c b/src/deb/extract.c index 5bad48597..48781a318 100644 --- a/src/deb/extract.c +++ b/src/deb/extract.c @@ -81,15 +81,15 @@ read_line(int fd, char *buf, size_t min_size, size_t max_size) size_t n = min_size; while (line_size < (ssize_t)max_size) { - ssize_t r; + ssize_t nread; char *nl; - r = fd_read(fd, buf + line_size, n); - if (r <= 0) - return r; + nread = fd_read(fd, buf + line_size, n); + if (nread <= 0) + return nread; - nl = memchr(buf + line_size, '\n', r); - line_size += r; + nl = memchr(buf + line_size, '\n', nread); + line_size += nread; if (nl != NULL) { nl[1] = '\0'; -- Dpkg.Org's dpkg
