libselinux: fix gcc -Wsign-compare warnings

Acked-by: Steve Lawrence <slawrence@tresys.com>
This commit is contained in:
Nicolas Iooss 2014-09-14 23:41:40 +02:00 committed by Steve Lawrence
parent 832e7017f8
commit ae5de8ae69
3 changed files with 8 additions and 7 deletions

View File

@ -213,7 +213,7 @@ static int process_line(struct selabel_handle *rec,
spec_arr[nspec].mode = 0;
if (type) {
mode_t mode = string_to_mode(type);
if (mode == -1) {
if (mode == (mode_t)-1) {
COMPAT_LOG(SELINUX_WARNING, "%s: line %d has invalid file type %s\n",
path, lineno, type);
mode = 0;
@ -240,19 +240,20 @@ static int load_mmap(struct selabel_handle *rec, const char *path, struct stat *
struct saved_data *data = (struct saved_data *)rec->data;
char mmap_path[PATH_MAX + 1];
int mmapfd;
int rc, i;
int rc;
struct stat mmap_stat;
char *addr;
size_t len;
int stem_map_len, *stem_map;
struct mmap_area *mmap_area;
uint32_t i;
uint32_t *magic;
uint32_t *section_len;
uint32_t *plen;
rc = snprintf(mmap_path, sizeof(mmap_path), "%s.bin", path);
if (rc >= sizeof(mmap_path))
if (rc >= (int)sizeof(mmap_path))
return -1;
mmapfd = open(mmap_path, O_RDONLY | O_CLOEXEC);
@ -445,7 +446,7 @@ static int process_file(const char *path, const char *suffix, struct selabel_han
/* append the path suffix if we have one */
if (suffix) {
rc = snprintf(stack_path, sizeof(stack_path), "%s.%s", path, suffix);
if (rc >= sizeof(stack_path)) {
if (rc >= (int)sizeof(stack_path)) {
errno = ENAMETOOLONG;
return -1;
}

View File

@ -176,7 +176,7 @@ static inline int sort_specs(struct saved_data *data)
{
struct spec *spec_copy;
struct spec spec;
int i;
unsigned int i;
int front, back;
size_t len = sizeof(*spec_copy);

View File

@ -72,7 +72,7 @@ static int process_file(struct saved_data *data, const char *filename)
spec->lr.ctx_raw = context;
spec->mode = string_to_mode(mode);
if (spec->mode == -1) {
if (spec->mode == (mode_t)-1) {
fprintf(stderr, "%s: line %d has invalid file type %s\n",
regex, line_num + 1, mode);
spec->mode = 0;
@ -362,7 +362,7 @@ int main(int argc, char *argv[])
return rc;
rc = snprintf(stack_path, sizeof(stack_path), "%s.bin", path);
if (rc < 0 || rc >= sizeof(stack_path))
if (rc < 0 || rc >= (int)sizeof(stack_path))
return rc;
if (asprintf(&tmp, "%sXXXXXX", stack_path) < 0)