From: Karel Zak <kzak@redhat.com>
Date: Wed, 28 Jan 2015 13:55:20 +0000 (+0100)
Subject: lib/sysfs: use ssize_t for sysfs_readlink() [coverity scan]
X-Git-Tag: v2.26-rc2~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8b150e9babe848459c2f58b258de1cc6048f1fe;p=thirdparty%2Futil-linux.git

lib/sysfs: use ssize_t for sysfs_readlink() [coverity scan]

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/lib/sysfs.c b/lib/sysfs.c
index 63a90dcbca..ac35596190 100644
--- a/lib/sysfs.c
+++ b/lib/sysfs.c
@@ -606,7 +606,7 @@ static char *get_subsystem(char *chain, char *buf, size_t bufsz)
 char *sysfs_get_devchain(struct sysfs_cxt *cxt, char *buf, size_t bufsz)
 {
 	/* read /sys/dev/block/<maj>:<min> symlink */
-	size_t sz = sysfs_readlink(cxt, NULL, buf, bufsz);
+	ssize_t sz = sysfs_readlink(cxt, NULL, buf, bufsz);
 	if (sz <= 0 || sz + sizeof(_PATH_SYS_DEVBLOCK "/") > bufsz)
 		return NULL;
 
@@ -776,10 +776,9 @@ int sysfs_devno_to_wholedisk(dev_t dev, char *diskname,
          */
         char linkpath[PATH_MAX];
         char *name;
-        int linklen;
+	ssize_t	linklen;
 
-        linklen = sysfs_readlink(&cxt, NULL,
-                linkpath, sizeof(linkpath) - 1);
+	linklen = sysfs_readlink(&cxt, NULL, linkpath, sizeof(linkpath) - 1);
         if (linklen < 0)
             goto err;
         linkpath[linklen] = '\0';