shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-10-27 18:55:19 +03:00
Code Releases Activity

wiping: add "Wiping skipped." for the message context to be complete

Browse Source
This commit is contained in:
Peter Rajnoha 2015-07-21 11:00:43 +02:00
parent 697fb353dc
commit c3fddb0fbb
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/device/dev-type.c
View File

@ -530,6 +530,7 @@ static inline int _type_in_flag_list(const char *type, uint32_t flag_list)
#define MSG_FAILED_SIG_OFFSET "Failed to get offset of the %s signature on %s." #define MSG_FAILED_SIG_OFFSET "Failed to get offset of the %s signature on %s."
#define MSG_FAILED_SIG_LENGTH "Failed to get length of the %s signature on %s." #define MSG_FAILED_SIG_LENGTH "Failed to get length of the %s signature on %s."
#define MSG_WIPING_SKIPPED " Wiping skipped."
static int _blkid_wipe(blkid_probe probe, struct device *dev, const char *name, static int _blkid_wipe(blkid_probe probe, struct device *dev, const char *name,
uint32_t types_to_exclude, uint32_t types_no_prompt, uint32_t types_to_exclude, uint32_t types_no_prompt,
@ -549,7 +550,7 @@ static int _blkid_wipe(blkid_probe probe, struct device *dev, const char *name,
log_error(MSG_FAILED_SIG_OFFSET, type, name); log_error(MSG_FAILED_SIG_OFFSET, type, name);
return 0; return 0;
} else { } else {
log_error("WARNING: " MSG_FAILED_SIG_OFFSET, type, name); log_error("WARNING: " MSG_FAILED_SIG_OFFSET MSG_WIPING_SKIPPED, type, name);
return 2; return 2;
} }
} }
@ -558,7 +559,7 @@ static int _blkid_wipe(blkid_probe probe, struct device *dev, const char *name,
log_error(MSG_FAILED_SIG_LENGTH, type, name); log_error(MSG_FAILED_SIG_LENGTH, type, name);
return 0; return 0;
} else { } else {
log_warn("WARNING: " MSG_FAILED_SIG_LENGTH, type, name); log_warn("WARNING: " MSG_FAILED_SIG_LENGTH MSG_WIPING_SKIPPED, type, name);
return 2; return 2;
} }
} }
@ -568,7 +569,7 @@ static int _blkid_wipe(blkid_probe probe, struct device *dev, const char *name,
log_error(MSG_FAILED_SIG_OFFSET, type, name); log_error(MSG_FAILED_SIG_OFFSET, type, name);
return 0; return 0;
} else { } else {
log_warn("WARNING: " MSG_FAILED_SIG_OFFSET, type, name); log_warn("WARNING: " MSG_FAILED_SIG_OFFSET MSG_WIPING_SKIPPED, type, name);
return 2; return 2;
} }
} }
@ -577,7 +578,7 @@ static int _blkid_wipe(blkid_probe probe, struct device *dev, const char *name,
log_error(MSG_FAILED_SIG_LENGTH, type, name); log_error(MSG_FAILED_SIG_LENGTH, type, name);
return 0; return 0;
} else { } else {
log_warn("WARNING: " MSG_FAILED_SIG_LENGTH, type, name); log_warn("WARNING: " MSG_FAILED_SIG_LENGTH MSG_WIPING_SKIPPED, type, name);
return 2; return 2;
} }
} }