Change recOpts in Image, it can be part of the Image struct, not a ptr.
This commit is contained in:
74
src/image.h
74
src/image.h
@@ -24,43 +24,6 @@
|
||||
|
||||
typedef struct Iso_Image_Rec_Opts IsoImageRecOpts;
|
||||
|
||||
struct Iso_Image
|
||||
{
|
||||
|
||||
int refcount;
|
||||
|
||||
IsoDir *root;
|
||||
|
||||
char *volset_id;
|
||||
|
||||
char *volume_id; /**< Volume identifier. */
|
||||
char *publisher_id; /**< Volume publisher. */
|
||||
char *data_preparer_id; /**< Volume data preparer. */
|
||||
char *system_id; /**< Volume system identifier. */
|
||||
char *application_id; /**< Volume application id */
|
||||
char *copyright_file_id;
|
||||
char *abstract_file_id;
|
||||
char *biblio_file_id;
|
||||
|
||||
/* message messenger for the image */
|
||||
struct libiso_msgs *messenger;
|
||||
|
||||
/**
|
||||
* Default filesystem to use when adding files to the image tree.
|
||||
*/
|
||||
IsoFilesystem *fs;
|
||||
|
||||
/*
|
||||
* Default builder to use when adding files to the image tree.
|
||||
*/
|
||||
IsoNodeBuilder *builder;
|
||||
|
||||
/**
|
||||
* Options for recursive directory addition
|
||||
*/
|
||||
IsoImageRecOpts *recOpts;
|
||||
};
|
||||
|
||||
/**
|
||||
* Options for recursive directory addition
|
||||
*/
|
||||
@@ -119,4 +82,41 @@ struct Iso_Image_Rec_Opts
|
||||
int (*report)(IsoFileSource *src, int action, int flag);
|
||||
};
|
||||
|
||||
struct Iso_Image
|
||||
{
|
||||
|
||||
int refcount;
|
||||
|
||||
IsoDir *root;
|
||||
|
||||
char *volset_id;
|
||||
|
||||
char *volume_id; /**< Volume identifier. */
|
||||
char *publisher_id; /**< Volume publisher. */
|
||||
char *data_preparer_id; /**< Volume data preparer. */
|
||||
char *system_id; /**< Volume system identifier. */
|
||||
char *application_id; /**< Volume application id */
|
||||
char *copyright_file_id;
|
||||
char *abstract_file_id;
|
||||
char *biblio_file_id;
|
||||
|
||||
/* message messenger for the image */
|
||||
struct libiso_msgs *messenger;
|
||||
|
||||
/**
|
||||
* Default filesystem to use when adding files to the image tree.
|
||||
*/
|
||||
IsoFilesystem *fs;
|
||||
|
||||
/*
|
||||
* Default builder to use when adding files to the image tree.
|
||||
*/
|
||||
IsoNodeBuilder *builder;
|
||||
|
||||
/**
|
||||
* Options for recursive directory addition
|
||||
*/
|
||||
IsoImageRecOpts recOpts;
|
||||
};
|
||||
|
||||
#endif /*LIBISO_IMAGE_H_*/
|
||||
|
Reference in New Issue
Block a user