Remove some bogus error checking and return void instead of int.

[oweals/opkg-lede.git] / libopkg / opkg_conf.h

diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h
index f774b4ace35d964a76979cebc9c453df32b30c17..b19e5ddca57da45f7661f6397be2138fddbb2550 100644 (file)
--- a/libopkg/opkg_conf.h
+++ b/libopkg/opkg_conf.h
@@ -41,6 +41,7 @@ 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;
@@ -49,28 +50,49 @@ struct opkg_conf
      pkg_dest_t *default_dest;
 
      char *tmp_dir;
-     const char *lists_dir;
-     const char *pending_dir;
+     char *lists_dir;
+     char *pending_dir;
 
      /* options */
      int autoremove;
      int force_depends;
      int force_defaults;
+     int force_maintainer;
      int force_overwrite;
      int force_downgrade;
      int force_reinstall;
      int force_space;
      int force_removal_of_dependent_packages;
      int force_removal_of_essential_packages;
+     int check_signature;
      int nodeps; /* do not follow dependences */
-     int verbose_wget;
-     int multiple_providers;
      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;
+     char *cache;
+
+#ifdef HAVE_SSLCURL
+     /* some options could be used by
+      * wget if curl support isn't builtin
+      * If someone want to try...
+      */
+     char *ssl_engine;
+     char *ssl_cert;
+     char *ssl_cert_type;
+     char *ssl_key;
+     char *ssl_key_type;
+     char *ssl_key_passwd;
+     char *ssl_ca_file;
+     char *ssl_ca_path;
+     int ssl_dont_verify_peer;
+#endif
+#ifdef HAVE_PATHFINDER
+     int check_x509_path;
+#endif
 
      /* proxy options */
      char *http_proxy;
@@ -79,6 +101,9 @@ struct opkg_conf
      char *proxy_user;
      char *proxy_passwd;
 
+     char *signature_ca_file;
+     char *signature_ca_path;
+
      hash_table_t pkg_hash;
      hash_table_t file_hash;
      hash_table_t obs_file_hash;
@@ -104,4 +129,7 @@ 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);
 
+
+void opkg_init_options_array(const opkg_conf_t *conf, opkg_option_t **options);
+
 #endif