diff options
| author | graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358> | 2009-11-05 19:50:12 (EST) |
|---|---|---|
| committer | graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358> | 2009-11-05 19:50:12 (EST) |
| commit | a6502c7951410e25df67c621165581ebd99fbb0f (patch) | |
| tree | dd72c34d515c73e733b03f9b5110bafd2cf83862 /libopkg/opkg_conf.c | |
| parent | ef04881ebc73c33de134a10b3cb8bb69f8008752 (diff) | |
Remove some bogus error checking and return void instead of int.
git-svn-id: http://opkg.googlecode.com/svn/trunk@266 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
Diffstat (limited to 'libopkg/opkg_conf.c')
| -rw-r--r-- | libopkg/opkg_conf.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c index b6ca4a8..ce68ae1 100644 --- a/libopkg/opkg_conf.c +++ b/libopkg/opkg_conf.c @@ -50,7 +50,7 @@ static int set_and_load_pkg_src_list(opkg_conf_t *conf, static int set_and_load_pkg_dest_list(opkg_conf_t *conf, nv_pair_list_t *nv_pair_list, char * lists_dir); -int opkg_init_options_array(const opkg_conf_t *conf, opkg_option_t **options) +void opkg_init_options_array(const opkg_conf_t *conf, opkg_option_t **options) { opkg_option_t tmp[] = { { "cache", OPKG_OPT_TYPE_STRING, &conf->cache}, @@ -99,7 +99,6 @@ int opkg_init_options_array(const opkg_conf_t *conf, opkg_option_t **options) *options = xcalloc(1, sizeof(tmp)); memcpy(*options, tmp, sizeof(tmp)); - return 0; }; static void opkg_conf_override_string(char **conf_str, char *arg_str) @@ -520,8 +519,7 @@ static int opkg_conf_parse_file(opkg_conf_t *conf, const char *filename, #define regmatch_size 12 regmatch_t regmatch[regmatch_size]; - if (opkg_init_options_array(conf, &options)<0) - return ENOMEM; + opkg_init_options_array(conf, &options); if (file == NULL) { fprintf(stderr, "%s: failed to open %s: %s\n", |