DistRen Changeset - 4186f3b04f1c · protofusion repositories

Changeset - 4186f3b04f1c

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Nathan Brink (binki) - 16 years ago 2009-06-29 22:34:43
ohnobinki@ohnopublishing.net

attempted to make the config's include function global

2 files changed with 4 insertions and 3 deletions:

src/client/libdistren_config.c

src/common/options.c

0 comments (0 inline, 0 general)

src/client/libdistren_config.c

➞

Show inline comments

@@ @@ -13,46 +13,45 @@ @@
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 /*
   Functions and code for retrieving the client's configuration information.
  */
 #include <libdistren.h>
 #include "options.h"
 /**
 @todo Stub
  */
 int _distren_getoptions(distren_t handle)
+{
   cfg_t *cfg;
   cfg_opt_t cfg_opts[] =
+    {
       CFG_STR("server", NULL, 0),
       CFG_FUNC("include", &cfg_include), /*< @todo this should be added by the lidistrencommon.so rather then individually */
       CFG_END()
     };
   if(options_init(0, NULL, &cfg, cfg_opts, "client", &handle->options))
+    {
       fprintf(stderr, "error getting configuration\n");
       return 1;
+    }
   return 1;
+}
 /**
 @todo stubish
  */
 int _distren_loseoptions(distren_t handle)
+{
   options_free(handle->options);
   return 0;
+}

src/common/options.c

➞

Show inline comments

@@ @@ -56,72 +56,74 @@ int options_init(int argc, char *argv[], @@
   *allopts = malloc(sizeof(struct options_common));
   if(!*allopts)
+    {
       perror("malloc");
       free(configfile);
       return 1;
+    }
   memset(*allopts, '\0', sizeof(struct options_common));
   (*allopts)->data = malloc(sizeof(struct options_common_data));
   if(!(*allopts)->data)
+    {
       perror("malloc");
       free(configfile);
       free(*allopts);
       return 1;
+    }
   memset((*allopts)->data, '\0', sizeof(struct options_common_data));
   /* Conf File Parser */
   cfg_opt_t common_opts[] =
+    {
       CFG_END()
     };
   /*
     In these arrays, I should replace NULL with a pointer to a string in the struct which should hold the result of confuse processing an option. This is partially because confuse will not free the values it parses.
    */
   cfg_opt_t server_opts[] =
+    {
       CFG_STR("username", NULL, CFGF_NONE),
       CFG_STR("hostname", NULL, CFGF_NONE),
       CFG_STR("method", "ssh", CFGF_NONE),
       CFG_STR_LIST("types", NULL, CFGF_NONE),
       CFG_END()
     };
   cfg_opt_t opts[] =
+    {
       CFG_SEC("common",
 	      common_opts,
 	      CFGF_NONE),
       CFG_SEC("server",
 	      server_opts,
 	      CFGF_MULTI | CFGF_TITLE),
       CFG_SEC(myname,
 	      myopts,
 ),
       CFG_FUNC("include",
 	       &cfg_include),
       CFG_END()
     };
   (*allopts)->data->cfg = cfg_init(opts, 0);
   switch(cfg_parse((*allopts)->data->cfg, configfile))
+    {
     default:
       fprintf(stderr, "cfg_parse returned an unknown error code\n");
     case CFG_FILE_ERROR:
       cfg_error((*allopts)->data->cfg, "Couldn't open file ``%s''\n", configfile);
       /* no break; on purpose */
     case CFG_PARSE_ERROR:
       free((*allopts)->data);
       free(*allopts);
       free(configfile);
       return 1;
     case CFG_SUCCESS:
       break;

0 comments (0 inline, 0 general)