shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

'_emit_areas_line' returns 1 for success and 0 for failure. This always

Browse Source 
confuses me, so I've added a comment at the top of the function to
remind me of this.

I also found that 'mirror_emit_segment_line' was returning 0 (return_0)
on failure /and/ success.  It now returns 1 for success and 0 for failure -
just like '_emit_areas_line' and its calling function, '_emit_segment_line'.
This commit is contained in:
Jonathan Earl Brassow 2009-09-22 16:26:59 +00:00
parent 3545e55a01
commit 3c74075fb1
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libdm/libdm-deptree.c
View File

@ -1258,6 +1258,11 @@ do {\
p += w;\ p += w;\
} while (0) } while (0)
/*
* _emit_areas_line
*
* Returns: 1 on success, 0 on failure
*/
static int _emit_areas_line(struct dm_task *dmt __attribute((unused)), static int _emit_areas_line(struct dm_task *dmt __attribute((unused)),
struct load_segment *seg, char *params, struct load_segment *seg, char *params,
size_t paramsize, int *pos) size_t paramsize, int *pos)
@ -1279,6 +1284,11 @@ static int _emit_areas_line(struct dm_task *dmt __attribute((unused)),
return 1; return 1;
} }
/*
* mirror_emit_segment_line
*
* Returns: 1 on success, 0 on failure
*/
static int mirror_emit_segment_line(struct dm_task *dmt, uint32_t major, static int mirror_emit_segment_line(struct dm_task *dmt, uint32_t major,
uint32_t minor, struct load_segment *seg, uint32_t minor, struct load_segment *seg,
uint64_t *seg_start, char *params, uint64_t *seg_start, char *params,
@ -1386,15 +1396,13 @@ static int mirror_emit_segment_line(struct dm_task *dmt, uint32_t major,
EMIT_PARAMS(pos, " %u ", seg->mirror_area_count); EMIT_PARAMS(pos, " %u ", seg->mirror_area_count);
if ((r = _emit_areas_line(dmt, seg, params, paramsize, &pos)) <= 0) { if ((r = _emit_areas_line(dmt, seg, params, paramsize, &pos)) <= 0)
stack; return_0;
return r;
}
if (handle_errors) if (handle_errors)
EMIT_PARAMS(pos, " 1 handle_errors"); EMIT_PARAMS(pos, " 1 handle_errors");
return 0; return 1;
} }
static int _emit_segment_line(struct dm_task *dmt, uint32_t major, static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
@ -1415,8 +1423,8 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
/* Mirrors are pretty complicated - now in separate function */ /* Mirrors are pretty complicated - now in separate function */
r = mirror_emit_segment_line(dmt, major, minor, seg, seg_start, r = mirror_emit_segment_line(dmt, major, minor, seg, seg_start,
params, paramsize); params, paramsize);
if (r) if (!r)
return r; return_0;
break; break;
case SEG_SNAPSHOT: case SEG_SNAPSHOT:
if (!_build_dev_string(originbuf, sizeof(originbuf), seg->origin)) if (!_build_dev_string(originbuf, sizeof(originbuf), seg->origin))