eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-05 16:00:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some untranslated error messages.

Browse Source
This commit is contained in:
Milan Broz
2019-04-23 10:41:06 +02:00
parent 428e61253c
commit cfe2fb66ab
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libdevmapper.c
View File

@@ -1396,7 +1396,7 @@ static void _dm_target_free_query_path(struct crypt_device *cd, struct dm_target
case DM_LINEAR:
break;
default:
log_err(NULL, "Unknown dm target type.");
log_err(cd, _("Unknown dm target type."));
return;
}

2
lib/luks2/luks2_json_metadata.c
View File

@@ -1855,7 +1855,7 @@ int LUKS2_activate(struct crypt_device *cd,
if (crypt_get_integrity_tag_size(cd)) {
if (!LUKS2_integrity_compatible(hdr)) {
log_err(cd, "Unsupported device integrity configuration.");
log_err(cd, _("Unsupported device integrity configuration."));
return -EINVAL;
}

16
lib/setup.c
View File

@@ -2513,7 +2513,7 @@ static int _reload_device_with_integrity(struct crypt_device *cd,
r = _compare_dm_devices(cd, sdmd, &tdmd);
if (r) {
log_err(cd, "Crypt devices mismatch.");
log_err(cd, _("Crypt devices mismatch."));
goto out;
}
@@ -2565,12 +2565,12 @@ static int _reload_device_with_integrity(struct crypt_device *cd,
}
if ((r = dm_suspend_device(cd, iname, 0))) {
log_err(cd, "Failed to suspend device %s.", iname);
log_err(cd, _("Failed to suspend device %s."), iname);
goto err_clear;
}
if ((r = dm_resume_device(cd, iname, act2dmflags(sdmdi->flags)))) {
log_err(cd, "Failed to resume device %s.", iname);
log_err(cd, _("Failed to resume device %s."), iname);
goto err_clear;
}
@@ -2584,12 +2584,12 @@ static int _reload_device_with_integrity(struct crypt_device *cd,
* burn it for good.
*/
log_err(cd, "Fatal error while reloading device %s (on top of device %s).", name, iname);
log_err(cd, _("Fatal error while reloading device %s (on top of device %s)."), name, iname);
if (dm_error_device(cd, name))
log_err(cd, "Failed to switch device %s to dm-error.", name);
log_err(cd, _("Failed to switch device %s to dm-error."), name);
if (dm_error_device(cd, iname))
log_err(cd, "Failed to switch device %s to dm-error.", iname);
log_err(cd, _("Failed to switch device %s to dm-error."), iname);
goto out;
err_clear:
@@ -4672,7 +4672,7 @@ int crypt_set_data_offset(struct crypt_device *cd, uint64_t data_offset)
if (!cd)
return -EINVAL;
if (data_offset % (MAX_SECTOR_SIZE >> SECTOR_SHIFT)) {
log_err(cd, "Data offset is not multiple of %u bytes.", MAX_SECTOR_SIZE);
log_err(cd, _("Data offset is not multiple of %u bytes."), MAX_SECTOR_SIZE);
return -EINVAL;
}
@@ -5504,7 +5504,7 @@ int crypt_serialize_lock(struct crypt_device *cd)
log_dbg(cd, "Taking global memory-hard access serialization lock.");
if (crypt_write_lock(cd, "memory-hard-access", true, &cd->pbkdf_memory_hard_lock)) {
log_err(cd, "Failed to acquire global memory-hard access serialization lock.");
log_err(cd, _("Failed to acquire global memory-hard access serialization lock."));
cd->pbkdf_memory_hard_lock = NULL;
return -EINVAL;
}

2
lib/utils_pbkdf.c
View File

@@ -181,7 +181,7 @@ int init_pbkdf_type(struct crypt_device *cd,
if (crypt_fips_mode()) {
if (pbkdf && strcmp(pbkdf->type, CRYPT_KDF_PBKDF2)) {
log_err(cd, "Only PBKDF2 is supported in FIPS mode.");
log_err(cd, _("Only PBKDF2 is supported in FIPS mode."));
return -EINVAL;
}
if (!pbkdf)

4
lib/utils_wipe.c
View File

@@ -179,7 +179,7 @@ int crypt_wipe_device(struct crypt_device *cd,
goto out;
if (lseek64(devfd, offset, SEEK_SET) < 0) {
log_err(cd, "Cannot seek to device offset.");
log_err(cd, _("Cannot seek to device offset."));
r = -EINVAL;
goto out;
}
@@ -203,7 +203,7 @@ int crypt_wipe_device(struct crypt_device *cd,
r = wipe_block(cd, devfd, pattern, sf, bsize, alignment,
wipe_block_size, offset, &need_block_init);
if (r) {
log_err(cd, "Device wipe error, offset %" PRIu64 ".", offset);
log_err(cd,_("Device wipe error, offset %" PRIu64 "."), offset);
break;
}