aboutsummaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/devfsd.c12
-rw-r--r--miscutils/less.c2
2 files changed, 7 insertions, 7 deletions
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index fce63e54d..fd5f54763 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -871,7 +871,7 @@ static void action_permissions (const struct devfsd_notify_struct *info,
} /* End Function action_permissions */
static void action_modload (const struct devfsd_notify_struct *info,
- const struct config_entry_struct *entry)
+ const struct config_entry_struct *entry ATTRIBUTE_UNUSED)
/* [SUMMARY] Load a module.
<info> The devfs change.
<entry> The config file entry.
@@ -1705,7 +1705,7 @@ static char get_old_ide_name (unsigned int major, unsigned int minor)
i==IDE6_MAJOR || i==IDE7_MAJOR || i==IDE8_MAJOR ||
i==IDE9_MAJOR )
{
- if(i==major)
+ if((unsigned int)i==major)
{
letter=c;
break;
@@ -1901,7 +1901,7 @@ static const char *expand_variable (char *buffer, unsigned int length,
for (ptr = input; isalnum (ch) || (ch == '_') || (ch == ':');ch = *++ptr)
/* VOID */ ;
len = ptr - input;
- if (len >= sizeof tmp)
+ if ((size_t)len >= sizeof tmp)
goto expand_variable_out;
safe_memcpy (tmp, input, len);
@@ -1927,7 +1927,7 @@ static const char *expand_variable (char *buffer, unsigned int length,
{
/* Must be simple variable expansion with "${var}" */
len = ptr - input;
- if (len >= sizeof tmp)
+ if ((size_t)len >= sizeof tmp)
goto expand_variable_out;
safe_memcpy (tmp, input, len);
@@ -1943,7 +1943,7 @@ static const char *expand_variable (char *buffer, unsigned int length,
}
/* It's that handy "${var:-word}" expression. Check if var is defined */
len = ptr - input;
- if (len >= sizeof tmp)
+ if ((size_t)len >= sizeof tmp)
goto expand_variable_out;
safe_memcpy (tmp, input, len);
@@ -1988,7 +1988,7 @@ static const char *expand_variable (char *buffer, unsigned int length,
pointer to start of word in "${var:-word}" */
input += 2;
len = ptr - input;
- if (len >= sizeof tmp)
+ if ((size_t)len >= sizeof tmp)
goto expand_variable_out;
safe_memcpy (tmp, input, len);
diff --git a/miscutils/less.c b/miscutils/less.c
index 0b0dc0c8b..df55b50ac 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -648,7 +648,7 @@ static char *process_regex_on_line(char *line, regex_t *pattern) {
match_found = 1;
line2 = insert_highlights(line2, match_structs.rm_so + prev_eo, match_structs.rm_eo + prev_eo);
- if (match_structs.rm_eo + 11 + prev_eo < strlen(line2))
+ if ((size_t)match_structs.rm_eo + 11 + prev_eo < strlen(line2))
strcat(sub_line, line2 + match_structs.rm_eo + 11 + prev_eo);
prev_eo += match_structs.rm_eo + 11;