device_mapper: simplify line emitter checking

diff --git a/device_mapper/libdm-deptree.c b/device_mapper/libdm-deptree.c
index 5b60dc91a9381337c0a5310fa97d84f3b969e637..ec345ac55c3a85cd61d309946dca4d14767e735e 100644 (file)
--- a/device_mapper/libdm-deptree.c
+++ b/device_mapper/libdm-deptree.c
@@ -2382,7 +2382,7 @@ static int _mirror_emit_segment_line(struct dm_task *dmt, struct load_segment *s
 
        EMIT_PARAMS(pos, " %u ", seg->mirror_area_count);
 
-       if (_emit_areas_line(dmt, seg, params, paramsize, &pos) <= 0)
+       if (!_emit_areas_line(dmt, seg, params, paramsize, &pos))
                return_0;
 
        if (handle_errors)
@@ -2584,7 +2584,7 @@ static int _raid_emit_segment_line(struct dm_task *dmt, uint32_t major,
        /* Print number of metadata/data device pairs */
        EMIT_PARAMS(pos, " %u", area_count);
 
-       if (_emit_areas_line(dmt, seg, params, paramsize, &pos) <= 0)
+       if (!_emit_areas_line(dmt, seg, params, paramsize, &pos))
                return_0;
 
        return 1;
@@ -2927,7 +2927,6 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
                              size_t paramsize)
 {
        int pos = 0;
-       int r;
        int target_type_is_raid = 0;
        char originbuf[DM_FORMAT_DEV_BUFSIZE], cowbuf[DM_FORMAT_DEV_BUFSIZE];
 
@@ -2938,8 +2937,7 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
                break;
        case SEG_MIRRORED:
                /* Mirrors are pretty complicated - now in separate function */
-               r = _mirror_emit_segment_line(dmt, seg, params, paramsize);
-               if (!r)
+               if (!_mirror_emit_segment_line(dmt, seg, params, paramsize))
                        return_0;
                break;
        case SEG_SNAPSHOT:
@@ -2960,7 +2958,7 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
                EMIT_PARAMS(pos, "%u %u ", seg->area_count, seg->stripe_size);
                break;
        case SEG_VDO:
-               if (!(r = _vdo_emit_segment_line(dmt, seg, params, paramsize)))
+               if (!_vdo_emit_segment_line(dmt, seg, params, paramsize))
                      return_0;
                break;
        case SEG_CRYPT:
@@ -2989,9 +2987,8 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
        case SEG_RAID6_LA_6:
        case SEG_RAID6_RA_6:
                target_type_is_raid = 1;
-               r = _raid_emit_segment_line(dmt, major, minor, seg, seg_start,
-                                           params, paramsize);
-               if (!r)
+               if (!_raid_emit_segment_line(dmt, major, minor, seg, seg_start,
+                                            params, paramsize))
                        return_0;
 
                break;
@@ -3032,10 +3029,9 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
        case SEG_CRYPT:
        case SEG_LINEAR:
        case SEG_STRIPED:
-               if ((r = _emit_areas_line(dmt, seg, params, paramsize, &pos)) <= 0) {
-                       stack;
-                       return r;
-               }
+               if (!_emit_areas_line(dmt, seg, params, paramsize, &pos))
+                       return_0;
+
                if (!params[0]) {
                        log_error("No parameters supplied for %s target "
                                  "%u:%u.", _dm_segtypes[seg->type].target,

diff --git a/device_mapper/libdm-report.c b/device_mapper/libdm-report.c
index 9279e33708ce1bda450a57aa3b6b59cb071586c2..1928354d3d90eb5ec4d8871010bc5db8a07ca353 100644 (file)
--- a/device_mapper/libdm-report.c
+++ b/device_mapper/libdm-report.c
@@ -492,7 +492,7 @@ static int _report_field_string_list(struct dm_report *rh,
                delimiter = ",";
        delimiter_len = strlen(delimiter);
 
-       i = pos = len = 0;
+       i = pos = 0;
        dm_list_iterate_items(sl, data) {
                arr[i].str = sl->str;
                if (!sort) {