diff options
author | graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358> | 2009-12-08 20:20:03 (EST) |
---|---|---|
committer | graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358> | 2009-12-08 20:20:03 (EST) |
commit | 2fdb3fc0b67757afd6fe7a244b6e14d2a546af0e (patch) | |
tree | a5e28a26a07e429a753f29945cc8ba9c4f6c9884 /libopkg/opkg_conf.h | |
parent | e4a49209222ea7385f64e9336425df115a3ea1a3 (diff) |
Merge commit 'grg' into HEAD
git-svn-id: http://opkg.googlecode.com/svn/trunk@471 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
Diffstat (limited to 'libopkg/opkg_conf.h')
-rw-r--r-- | libopkg/opkg_conf.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h index fc14e09..a268bba 100644 --- a/libopkg/opkg_conf.h +++ b/libopkg/opkg_conf.h @@ -19,6 +19,7 @@ #define OPKG_CONF_H typedef struct opkg_conf opkg_conf_t; +extern opkg_conf_t *conf; #include "hash_table.h" #include "args.h" @@ -40,7 +41,6 @@ typedef struct opkg_conf opkg_conf_t; struct opkg_conf { - int lock_fd; /* file descriptor for the lock file */ pkg_src_list_t pkg_src_list; pkg_dest_list_t pkg_dest_list; nv_pair_list_t arch_list; @@ -51,6 +51,8 @@ struct opkg_conf char *tmp_dir; char *lists_dir; + uint pfm; /* package field mask */ + /* options */ int autoremove; int force_depends; @@ -65,9 +67,6 @@ struct opkg_conf int check_signature; int nodeps; /* do not follow dependences */ char *offline_root; - char *offline_root_path; - char *offline_root_pre_script_cmd; - char *offline_root_post_script_cmd; int query_all; int verbosity; int noaction; @@ -118,16 +117,13 @@ typedef struct opkg_option opkg_option_t; struct opkg_option { const char *name; const opkg_option_type_t type; - const void *value; + void * const value; }; -int opkg_conf_init(opkg_conf_t *conf, const args_t *args); -void opkg_conf_deinit(opkg_conf_t *conf); - -int opkg_conf_write_status_files(opkg_conf_t *conf); -char *root_filename_alloc(opkg_conf_t *conf, char *filename); - +int opkg_conf_init(const args_t *args); +void opkg_conf_deinit(void); -void opkg_init_options_array(const opkg_conf_t *conf, opkg_option_t **options); +int opkg_conf_write_status_files(void); +char *root_filename_alloc(char *filename); #endif |