morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

core/import-creds: rename import_credentials_context_free() to _done()

Browse Source 
This is allocated on stack, hence rename as per our coding style.
While at it, make sure the struct name is consistent with funcs.
This commit is contained in:
Mike Yuan
2024-09-11 17:15:19 +02:00
parent 445b7073c7
commit d0fcb614cb
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/core/import-creds.c
View File

@@ -66,19 +66,19 @@
* Net result: the service manager can pick up trusted credentials from $CREDENTIALS_DIRECTORY afterwards,
* and untrusted ones from $ENCRYPTED_CREDENTIALS_DIRECTORY. */
typedef struct ImportCredentialContext {
typedef struct ImportCredentialsContext {
int target_dir_fd;
size_t size_sum;
unsigned n_credentials;
} ImportCredentialContext;
} ImportCredentialsContext;
static void import_credentials_context_free(ImportCredentialContext *c) {
static void import_credentials_context_done(ImportCredentialsContext *c) {
assert(c);
c->target_dir_fd = safe_close(c->target_dir_fd);
safe_close(c->target_dir_fd);
}
static int acquire_credential_directory(ImportCredentialContext *c, const char *path, bool with_mount) {
static int acquire_credential_directory(ImportCredentialsContext *c, const char *path, bool with_mount) {
int r;
assert(c);
@@ -130,7 +130,7 @@ static int open_credential_file_for_write(int target_dir_fd, const char *dir_nam
return fd;
}
static bool credential_size_ok(ImportCredentialContext *c, const char *name, uint64_t size) {
static bool credential_size_ok(const ImportCredentialsContext *c, const char *name, uint64_t size) {
assert(c);
assert(name);
@@ -169,7 +169,7 @@ static int finalize_credentials_dir(const char *dir, const char *envvar) {
}
static int import_credentials_boot(void) {
_cleanup_(import_credentials_context_free) ImportCredentialContext context = {
_cleanup_(import_credentials_context_done) ImportCredentialsContext context = {
.target_dir_fd = -EBADF,
};
int r;
@@ -285,7 +285,7 @@ static int import_credentials_boot(void) {
}
static int proc_cmdline_callback(const char *key, const char *value, void *data) {
ImportCredentialContext *c = ASSERT_PTR(data);
ImportCredentialsContext *c = ASSERT_PTR(data);
_cleanup_free_ void *binary = NULL;
_cleanup_free_ char *n = NULL;
_cleanup_close_ int nfd = -EBADF;
@@ -360,7 +360,7 @@ static int proc_cmdline_callback(const char *key, const char *value, void *data)
return 0;
}
static int import_credentials_proc_cmdline(ImportCredentialContext *c) {
static int import_credentials_proc_cmdline(ImportCredentialsContext *c) {
int r;
assert(c);
@@ -374,7 +374,7 @@ static int import_credentials_proc_cmdline(ImportCredentialContext *c) {
#define QEMU_FWCFG_PATH "/sys/firmware/qemu_fw_cfg/by_name/opt/io.systemd.credentials"
static int import_credentials_qemu(ImportCredentialContext *c) {
static int import_credentials_qemu(ImportCredentialsContext *c) {
_cleanup_free_ DirectoryEntries *de = NULL;
_cleanup_close_ int source_dir_fd = -EBADF;
int r;
@@ -471,7 +471,7 @@ static int import_credentials_qemu(ImportCredentialContext *c) {
return 0;
}
static int parse_smbios_strings(ImportCredentialContext *c, const char *data, size_t size) {
static int parse_smbios_strings(ImportCredentialsContext *c, const char *data, size_t size) {
size_t left, skip;
const char *p;
int r;
@@ -573,9 +573,11 @@ static int parse_smbios_strings(ImportCredentialContext *c, const char *data, si
return 0;
}
static int import_credentials_smbios(ImportCredentialContext *c) {
static int import_credentials_smbios(ImportCredentialsContext *c) {
int r;
assert(c);
/* Parses DMI OEM strings fields (SMBIOS type 11), as settable with qemu's -smbios type=11,value=… switch. */
if (detect_container() > 0) /* don't access /sys/ in a container */
@@ -607,7 +609,7 @@ static int import_credentials_smbios(ImportCredentialContext *c) {
return 0;
}
static int import_credentials_initrd(ImportCredentialContext *c) {
static int import_credentials_initrd(ImportCredentialsContext *c) {
_cleanup_free_ DirectoryEntries *de = NULL;
_cleanup_close_ int source_dir_fd = -EBADF;
int r;
@@ -700,7 +702,7 @@ static int import_credentials_initrd(ImportCredentialContext *c) {
}
static int import_credentials_trusted(void) {
_cleanup_(import_credentials_context_free) ImportCredentialContext c = {
_cleanup_(import_credentials_context_done) ImportCredentialsContext c = {
.target_dir_fd = -EBADF,
};
int q, w, r, y;
@@ -728,7 +730,7 @@ static int import_credentials_trusted(void) {
}
static int merge_credentials_trusted(const char *creds_dir) {
_cleanup_(import_credentials_context_free) ImportCredentialContext c = {
_cleanup_(import_credentials_context_done) ImportCredentialsContext c = {
.target_dir_fd = -EBADF,
};
int r;