Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16e9f6d4 authored by Dmitry Eremin's avatar Dmitry Eremin Committed by Greg Kroah-Hartman
Browse files

staging/lustre/libcfs: fix issues found by Klocwork Insight tool 



sscanf format specification '%u' expects type 'unsigned int *'
for 'u', but parameter 3 has a different type 'int*'.

Signed-off-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-on: http://review.whamcloud.com/9400
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4629


Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarJames Simmons <uja.ornl@gmail.com>
Signed-off-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ba0e1b53

drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -881,7 +881,7 @@ cfs_cpt_table_create_pattern(char *pattern) 
			break;

			break;

		}

		}





		if (sscanf(str, "%u%n", &cpt, &n) < 1) {

		if (sscanf(str, "%d%n", &cpt, &n) < 1) {

			CERROR("Invalid cpu pattern %s\n", str);

			CERROR("Invalid cpu pattern %s\n", str);

			goto failed;

			goto failed;

		}

		}

drivers/staging/lustre/lustre/libcfs/nidstrings.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -227,10 +227,10 @@ libcfs_ip_addr2str(__u32 addr, char *str) 
int

int

libcfs_ip_str2addr(const char *str, int nob, __u32 *addr)

libcfs_ip_str2addr(const char *str, int nob, __u32 *addr)

{

{

	int   a;

	unsigned int	a;

	int   b;

	unsigned int	b;

	int   c;

	unsigned int	c;

	int   d;

	unsigned int	d;

	int		n = nob; /* XscanfX */

	int		n = nob; /* XscanfX */





	/* numeric IP? */

	/* numeric IP? */
@@ -419,7 +419,7 @@ libcfs_str2net_internal(const char *str, __u32 *net) 
{

{

	struct netstrfns *uninitialized_var(nf);

	struct netstrfns *uninitialized_var(nf);

	int	       nob;

	int	       nob;

	int	       netnum;

	unsigned int   netnum;

	int	       i;

	int	       i;





	for (i = 0; i < libcfs_nnetstrfns; i++) {

	for (i = 0; i < libcfs_nnetstrfns; i++) {