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

LUKS2 code cleanup.

Browse Source 
- drop unused code
- drop unused function declarations
- remove local routines from internal api
This commit is contained in:
Ondrej Kozina
2019-08-05 18:26:07 +02:00
parent 91879960e6
commit a23e1cf729
8 changed files with 79 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/luks2/luks2_segment.c
View File

@@ -21,16 +21,6 @@
#include "luks2_internal.h"
json_object *json_get_segments_jobj(json_object *hdr_jobj)
{
json_object *jobj_segments;
if (!hdr_jobj || !json_object_object_get_ex(hdr_jobj, "segments", &jobj_segments))
return NULL;
return jobj_segments;
}
/* use only on already validated 'segments' object */
uint64_t json_segments_get_minimal_offset(json_object *jobj_segments, unsigned blockwise)
{
@@ -124,7 +114,7 @@ int json_segment_get_sector_size(json_object *jobj_segment)
return json_object_get_int(jobj);
}
json_object *json_segment_get_flags(json_object *jobj_segment)
static json_object *json_segment_get_flags(json_object *jobj_segment)
{
json_object *jobj;
@@ -159,11 +149,6 @@ bool json_segment_is_backup(json_object *jobj_segment)
return json_segment_contains_flag(jobj_segment, "backup-", 7);
}
bool json_segment_is_reencrypt(json_object *jobj_segment)
{
return json_segment_contains_flag(jobj_segment, "in-reencryption", 0);
}
json_object *json_segments_get_segment(json_object *jobj_segments, int segment)
{
json_object *jobj;
@@ -215,16 +200,6 @@ static void _get_segment_or_id_by_flag(json_object *jobj_segments, const char *f
}
}
json_object *json_segments_get_segment_by_flag(json_object *jobj_segments, const char *flag)
{
json_object *jobj_segment = NULL;
if (jobj_segments)
_get_segment_or_id_by_flag(jobj_segments, flag, 0, &jobj_segment);
return jobj_segment;
}
void json_segment_remove_flag(json_object *jobj_segment, const char *flag)
{
json_object *jobj_flags, *jobj_flags_new;
@@ -435,20 +410,3 @@ json_object *LUKS2_get_segment_by_flag(struct luks2_hdr *hdr, const char *flag)
return jobj_segment;
}
json_object *LUKS2_get_ignored_segments(struct luks2_hdr *hdr)
{
json_object *jobj_segments, *jobj = json_object_new_object();
int i = 0;
if (!jobj || !json_object_object_get_ex(hdr->jobj, "segments", &jobj_segments))
return NULL;
json_object_object_foreach(jobj_segments, key, value) {
UNUSED(key);
if (json_segment_is_backup(value))
json_object_object_add_by_uint(jobj, i++, json_object_get(value));
}
return jobj;
}