summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--WHATS_NEW_DM2
-rw-r--r--libdm/libdm-common.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 0f088066..59f544d6 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,7 @@
Version 1.02.64 -
===================================
+ Use dm_snprintf() to fix signess warning in dm_set_dev_dir().
+ Use unsigned loop counter to fix signess warning in _other_node_ops().
Fix const cast in dmsetup calls of dm_report_field_string().
Streamline /dev/mapper/control node code for common cases.
Use hard-coded dm control node device number for 2.6.36 kernels and above.
diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c
index 7cce3a7a..1ae1027c 100644
--- a/libdm/libdm-common.c
+++ b/libdm/libdm-common.c
@@ -794,7 +794,7 @@ static void _del_node_op(struct node_op_parms *nop)
/* Check if there is other the type of node operation stacked */
static int _other_node_ops(node_op_t type)
{
- int i;
+ unsigned i;
for (i = 0; i < NUM_NODES; i++)
if (type != i && _count_node_ops[i])
@@ -958,8 +958,7 @@ int dm_set_dev_dir(const char *dev_dir)
len = strlen(dev_dir);
slash = dev_dir[len-1] == '/' ? "" : "/";
- if (snprintf(_dm_dir, sizeof _dm_dir, "%s%s%s", dev_dir, slash, DM_DIR)
- >= sizeof _dm_dir) {
+ if (dm_snprintf(_dm_dir, sizeof _dm_dir, "%s%s%s", dev_dir, slash, DM_DIR) < 0) {
log_debug("Invalid dev_dir value, %s: name too long.", dev_dir);
return 0;
}