X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=gconfig.c;h=b7107aa652213a58af500c9c08f1f15314c78608;hb=refs%2Fheads%2Fmaint-1.6;hp=5f16b8ca520f7cb292a0f972b4b499e77fad62e5;hpb=8bad57de823fc72394145f4a29678b4b72b8ed7a;p=radsecproxy.git

diff --git a/gconfig.c b/gconfig.c
index 5f16b8c..b7107aa 100644
--- a/gconfig.c
+++ b/gconfig.c
@@ -87,7 +87,7 @@ FILE *pushgconffile(struct gconffile **cf, FILE *file, const char *description)
     desc = stringcopy(description, 0);
     if (!desc)
 	goto errmalloc;
-    
+
     if (!*cf) {
 	newcf = malloc(sizeof(struct gconffile) * 2);
 	if (!newcf)
@@ -105,8 +105,8 @@ FILE *pushgconffile(struct gconffile **cf, FILE *file, const char *description)
     newcf[0].path = desc;
     *cf = newcf;
     return file;
-    
- errmalloc:
+
+errmalloc:
     free(desc);
     fclose(file);
     debug(DBG_ERR, "malloc failed");
@@ -125,7 +125,7 @@ FILE *pushgconfpaths(struct gconffile **cf, const char *cfgpath) {
     FILE *f = NULL;
     glob_t globbuf;
     char *path, *curfile = NULL, *dir;
-    
+
     /* if cfgpath is relative, make it relative to current config */
     if (*cfgpath == '/')
 	path = (char *)cfgpath;
@@ -148,7 +148,7 @@ FILE *pushgconfpaths(struct gconffile **cf, const char *cfgpath) {
     }
     memset(&globbuf, 0, sizeof(glob_t));
     if (glob(path, 0, NULL, &globbuf)) {
-	debug(DBG_INFO, "could not glob %s", path);
+	debug(DBG_WARN, "could not glob %s", path);
 	goto exit;
     }
 
@@ -156,10 +156,10 @@ FILE *pushgconfpaths(struct gconffile **cf, const char *cfgpath) {
 	f = pushgconfpath(cf, globbuf.gl_pathv[i]);
 	if (!f)
 	    break;
-    }    
+    }
     globfree(&globbuf);
 
- exit:    
+exit:
     if (curfile) {
 	free(curfile);
 	free(path);
@@ -204,7 +204,7 @@ void freegconf(struct gconffile **cf) {
 
     if (!*cf)
 	return;
-    
+
     for (i = 0; (*cf)[i].data || (*cf)[i].path; i++) {
 	if ((*cf)[i].file) {
 	    fclose((*cf)[i].file);
@@ -242,10 +242,10 @@ struct gconffile *openconfigfile(const char *file) {
 
 int getlinefromcf(struct gconffile *cf, char *line, const size_t size) {
     size_t i, pos;
-    
+
     if (!cf)
 	return 0;
-    
+
     if (cf->file)
 	return fgets(line, size, cf->file) ? 1 : 0;
     else if (cf->data) {
@@ -269,11 +269,11 @@ int getconfigline(struct gconffile **cf, char *block, char **opt, char **val, in
     char line[1024];
     char *tokens[3], *s;
     int tcount;
-    
+
     *opt = NULL;
     *val = NULL;
     *conftype = 0;
-    
+
     if (!cf || !*cf || (!(*cf)->file && !(*cf)->data))
 	return 1;
 
@@ -304,7 +304,7 @@ int getconfigline(struct gconffile **cf, char *block, char **opt, char **val, in
 	}
 	break;
     }
-    
+
     switch (tcount) {
     case 2:
 	*opt = stringcopy(tokens[0], 0);
@@ -347,13 +347,13 @@ int getconfigline(struct gconffile **cf, char *block, char **opt, char **val, in
 
     if (**val)
 	return 1;
-    
+
     debug(DBG_ERR, "configuration error, option %s needs a non-empty value", *opt);
     goto errexit;
 
- errmalloc:
+errmalloc:
     debug(DBG_ERR, "malloc failed");
- errexit:    
+errexit:
     free(*opt);
     *opt = NULL;
     free(*val);
@@ -383,6 +383,8 @@ void unhex(char *s) {
     *s = '\0';
 }
 
+typedef int (*t_fptr)(struct gconffile **, void *, char *, char *, char *);
+
 /* returns 1 if ok, 0 on error */
 /* caller must free returned values also on error */
 int getgenericconfig(struct gconffile **cf, char *block, ...) {
@@ -391,7 +393,7 @@ int getgenericconfig(struct gconffile **cf, char *block, ...) {
     uint8_t *bln = NULL;
     long int *lint = NULL;
     int type = 0, conftype = 0, n;
-    int (*cbk)(struct gconffile **, void *, char *, char *, char *) = NULL;
+    t_fptr cbk = NULL;
     void *cbkarg = NULL;
 
     for (;;) {
@@ -409,7 +411,7 @@ int getgenericconfig(struct gconffile **cf, char *block, ...) {
 	    free(val);
 	    continue;
 	}
-	    
+
 	va_start(ap, block);
 	while ((word = va_arg(ap, char *))) {
 	    type = va_arg(ap, int);
@@ -435,7 +437,7 @@ int getgenericconfig(struct gconffile **cf, char *block, ...) {
 		    goto errparam;
 		break;
 	    case CONF_CBK:
-		cbk = va_arg(ap, int (*)(struct gconffile **, void *, char *, char *, char *));
+		cbk = va_arg(ap, t_fptr);
 		if (!cbk)
 		    goto errparam;
 		cbkarg = va_arg(ap, void *);
@@ -447,7 +449,7 @@ int getgenericconfig(struct gconffile **cf, char *block, ...) {
 		break;
 	}
 	va_end(ap);
-	
+
 	if (!word) {
 	    if (block)
 		debug(DBG_ERR, "configuration error in block %s, unknown option %s", block, opt);
@@ -530,16 +532,20 @@ int getgenericconfig(struct gconffile **cf, char *block, ...) {
 	}
 	if (block)
 	    debug(DBG_DBG, "getgenericconfig: block %s: %s = %s", block, opt, val);
-	else 
+	else
 	    debug(DBG_DBG, "getgenericconfig: %s = %s", opt, val);
 	if (type == CONF_BLN || type == CONF_LINT)
 	    free(val);
     }
 
- errparam:
+errparam:
     debug(DBG_ERR, "getgenericconfig: internal parameter error");
- errexit:
+errexit:
     free(opt);
     free(val);
     return 0;
 }
+
+/* Local Variables: */
+/* c-file-style: "stroustrup" */
+/* End: */