ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lib: [cpuset.c] fix compiler warnings [-Wsign-compare] 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2011-08-01 12:24:22 +02:00
parent edd1362f8c
commit 8a929ed7c0
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/cpuset.c
View File

@ -147,15 +147,15 @@ int __cpuset_count_s(size_t setsize, const cpu_set_t *set)
char *cpulist_create(char *str, size_t len, char *cpulist_create(char *str, size_t len,
cpu_set_t *set, size_t setsize) cpu_set_t *set, size_t setsize)
{ {
int i; size_t i;
char *ptr = str; char *ptr = str;
int entry_made = 0; int entry_made = 0;
size_t max = cpuset_nbits(setsize); size_t max = cpuset_nbits(setsize);
for (i = 0; i < max; i++) { for (i = 0; i < max; i++) {
if (CPU_ISSET_S(i, setsize, set)) { if (CPU_ISSET_S(i, setsize, set)) {
int j, rlen; int rlen;
int run = 0; size_t j, run = 0;
entry_made = 1; entry_made = 1;
for (j = i + 1; j < max; j++) { for (j = i + 1; j < max; j++) {
if (CPU_ISSET_S(j, setsize, set)) if (CPU_ISSET_S(j, setsize, set))
@ -164,18 +164,21 @@ char *cpulist_create(char *str, size_t len,
break; break;
} }
if (!run) if (!run)
rlen = snprintf(ptr, len, "%d,", i); rlen = snprintf(ptr, len, "%zd,", i);
else if (run == 1) { else if (run == 1) {
rlen = snprintf(ptr, len, "%d,%d,", i, i + 1); rlen = snprintf(ptr, len, "%zd,%zd,", i, i + 1);
i++; i++;
} else { } else {
rlen = snprintf(ptr, len, "%d-%d,", i, i + run); rlen = snprintf(ptr, len, "%zd-%zd,", i, i + run);
i += run; i += run;
} }
if (rlen < 0 || rlen + 1 > len) if (rlen < 0 || (size_t) rlen + 1 > len)
return NULL; return NULL;
ptr += rlen; ptr += rlen;
len -= rlen; if (rlen > 0 && len > (size_t) rlen)
len -= rlen;
else
len = 0;
} }
} }
ptr -= entry_made; ptr -= entry_made;
@ -197,7 +200,7 @@ char *cpumask_create(char *str, size_t len,
for (cpu = cpuset_nbits(setsize) - 4; cpu >= 0; cpu -= 4) { for (cpu = cpuset_nbits(setsize) - 4; cpu >= 0; cpu -= 4) {
char val = 0; char val = 0;
if (len == (ptr - str)) if (len == (size_t) (ptr - str))
break; break;
if (CPU_ISSET_S(cpu, setsize, set)) if (CPU_ISSET_S(cpu, setsize, set))