From df095ad14d4217ab3223862f3a6b9a2134c709b2 Mon Sep 17 00:00:00 2001
From: graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>
Date: Thu, 10 Dec 2009 22:04:53 -0500
Subject: Remove args_t and cleanup unused stuff.

git-svn-id: http://opkg.googlecode.com/svn/trunk@484 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
---
(limited to 'libopkg/opkg_conf.h')

diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h
index a268bba..67b660f 100644
--- a/libopkg/opkg_conf.h
+++ b/libopkg/opkg_conf.h
@@ -22,7 +22,6 @@ typedef struct opkg_conf opkg_conf_t;
 extern opkg_conf_t *conf;
 
 #include "hash_table.h"
-#include "args.h"
 #include "pkg.h"
 #include "pkg_hash.h"
 #include "pkg_src_list.h"
@@ -33,6 +32,8 @@ extern opkg_conf_t *conf;
 #define OPKG_CONF_TMP_DIR_SUFFIX "opkg-XXXXXX"
 #define OPKG_CONF_LISTS_DIR  OPKG_STATE_DIR_PREFIX "/lists"
 
+#define OPKG_CONF_DEFAULT_CONF_FILE_DIR OPKGETCDIR"/opkg"
+
 /* In case the config file defines no dest */
 #define OPKG_CONF_DEFAULT_DEST_NAME "root"
 #define OPKG_CONF_DEFAULT_DEST_ROOT_DIR "/"
@@ -47,6 +48,9 @@ struct opkg_conf
 
      int restrict_to_default_dest;
      pkg_dest_t *default_dest;
+     char *dest_str;
+
+     char *conf_file;
 
      char *tmp_dir;
      char *lists_dir;
@@ -120,7 +124,7 @@ struct opkg_option {
      void * const value;
 };
 
-int opkg_conf_init(const args_t *args);
+int opkg_conf_init(void);
 void opkg_conf_deinit(void);
 
 int opkg_conf_write_status_files(void);
--
cgit v0.9.1