... | ... |
@@ -139,7 +139,7 @@ enum { |
139 | 139 |
memcpy(buff, buff + smax - sleft, sleft); \ |
140 | 140 |
size_t tmp = fmap_readn(map, buff + sleft, pos, BUFSIZ - sleft); \ |
141 | 141 |
smax = tmp; \ |
142 |
- if (-1 == tmp) { \ |
|
142 |
+ if (((size_t) -1) == tmp) { \ |
|
143 | 143 |
cli_dbgmsg("SIS: Read failed during GETD2\n"); \ |
144 | 144 |
FREE(alangs); \ |
145 | 145 |
FREE(ptrs); \ |
... | ... |
@@ -169,7 +169,7 @@ enum { |
169 | 169 |
} \ |
170 | 170 |
pos += (N)-sleft; \ |
171 | 171 |
size_t tmp = fmap_readn(map, buff, pos, BUFSIZ); \ |
172 |
- if (-1 == tmp) { \ |
|
172 |
+ if (((size_t) -1) == tmp) { \ |
|
173 | 173 |
cli_dbgmsg("SIS: Read failed during SKIP\n"); \ |
174 | 174 |
free(alangs); \ |
175 | 175 |
return CL_CLEAN; \ |
... | ... |
@@ -361,11 +361,13 @@ static int real_scansis(cli_ctx *ctx, const char *tmpd) |
361 | 361 |
switch (pkgtype) { |
362 | 362 |
case PKGlangfile: |
363 | 363 |
fcount = sis.langs; |
364 |
+ break; |
|
364 | 365 |
case PKGfile: { |
365 | 366 |
uint32_t ftype, options, ssname, psname, sdname, pdname; |
366 | 367 |
const char *sftype; |
367 | 368 |
uint32_t *lens, *olens; |
368 | 369 |
char *fn; |
370 |
+ fcount = sis.langs; |
|
369 | 371 |
|
370 | 372 |
GETD2(ftype); |
371 | 373 |
GETD2(options); |