mirror of
https://github.com/systemd/systemd.git
synced 2024-12-23 21:35:11 +03:00
various: unexport a few internal structs
We don't expose destructors for these internal structs already. Let's make the struct itself implementation detail too.
This commit is contained in:
parent
049f178b80
commit
0e3638380d
@ -11,6 +11,12 @@
|
||||
#include "proc-cmdline.h"
|
||||
#include "efivars.h"
|
||||
|
||||
typedef struct KernelHibernateLocation {
|
||||
char *device;
|
||||
uint64_t offset;
|
||||
bool offset_set;
|
||||
} KernelHibernateLocation;
|
||||
|
||||
static KernelHibernateLocation* kernel_hibernate_location_free(KernelHibernateLocation *k) {
|
||||
if (!k)
|
||||
return NULL;
|
||||
@ -22,6 +28,19 @@ static KernelHibernateLocation* kernel_hibernate_location_free(KernelHibernateLo
|
||||
|
||||
DEFINE_TRIVIAL_CLEANUP_FUNC(KernelHibernateLocation*, kernel_hibernate_location_free);
|
||||
|
||||
typedef struct EFIHibernateLocation {
|
||||
char *device;
|
||||
|
||||
sd_id128_t uuid;
|
||||
uint64_t offset;
|
||||
|
||||
char *kernel_version;
|
||||
char *id;
|
||||
char *image_id;
|
||||
char *version_id;
|
||||
char *image_version;
|
||||
} EFIHibernateLocation;
|
||||
|
||||
static EFIHibernateLocation* efi_hibernate_location_free(EFIHibernateLocation *e) {
|
||||
if (!e)
|
||||
return NULL;
|
||||
|
@ -5,24 +5,8 @@
|
||||
|
||||
#include "sd-id128.h"
|
||||
|
||||
typedef struct KernelHibernateLocation {
|
||||
char *device;
|
||||
uint64_t offset;
|
||||
bool offset_set;
|
||||
} KernelHibernateLocation;
|
||||
|
||||
typedef struct EFIHibernateLocation {
|
||||
char *device;
|
||||
|
||||
sd_id128_t uuid;
|
||||
uint64_t offset;
|
||||
|
||||
char *kernel_version;
|
||||
char *id;
|
||||
char *image_id;
|
||||
char *version_id;
|
||||
char *image_version;
|
||||
} EFIHibernateLocation;
|
||||
typedef struct KernelHibernateLocation KernelHibernateLocation;
|
||||
typedef struct EFIHibernateLocation EFIHibernateLocation;
|
||||
|
||||
typedef struct HibernateInfo {
|
||||
const char *device;
|
||||
|
@ -16,6 +16,15 @@
|
||||
#include "strv.h"
|
||||
#include "tmpfile-util-label.h"
|
||||
|
||||
typedef struct EditFile {
|
||||
EditFileContext *context;
|
||||
char *path;
|
||||
char *original_path;
|
||||
char **comment_paths;
|
||||
char *temp;
|
||||
unsigned line;
|
||||
} EditFile;
|
||||
|
||||
void edit_file_context_done(EditFileContext *context) {
|
||||
int r;
|
||||
|
||||
|
@ -7,18 +7,8 @@
|
||||
#define DROPIN_MARKER_END "### Edits below this comment will be discarded"
|
||||
|
||||
typedef struct EditFile EditFile;
|
||||
typedef struct EditFileContext EditFileContext;
|
||||
|
||||
struct EditFile {
|
||||
EditFileContext *context;
|
||||
char *path;
|
||||
char *original_path;
|
||||
char **comment_paths;
|
||||
char *temp;
|
||||
unsigned line;
|
||||
};
|
||||
|
||||
struct EditFileContext {
|
||||
typedef struct EditFileContext {
|
||||
EditFile *files;
|
||||
size_t n_files;
|
||||
const char *marker_start;
|
||||
@ -26,7 +16,7 @@ struct EditFileContext {
|
||||
bool remove_parent;
|
||||
bool overwrite_with_origin; /* Always overwrite target with original file. */
|
||||
bool stdin; /* Read contents from stdin instead of launching an editor. */
|
||||
};
|
||||
} EditFileContext;
|
||||
|
||||
void edit_file_context_done(EditFileContext *context);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user