config parsing: Break out cfgfatal_cl_type

No functional change.  We are going to reuse and improve this.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/conffile.c b/conffile.c
index e3a74aab90fd481b73b0b8455db5eb17603054be..8c4385cd4477f795b9a5830e495ca240a5c8f7ea 100644 (file)
--- a/conffile.c
+++ b/conffile.c
@@ -667,7 +667,7 @@ void *find_cl_if(dict_t *dict, cstring_t name, uint32_t type,
     }
     cl=i->data.closure;
     if (cl->type!=type) {
-       cfgfatal(loc,desc,"\"%s\" is the wrong type of closure\n",name);
+       cfgfatal_cl_type(loc,desc,cl,type,name);
     }
     return cl->interface;
 }

diff --git a/log.c b/log.c
index 1ff2e5cd8c19df25c8da074df1b2e6733f6977b3..dd3e4776c4517d79cc84b14615379f7ffd56b6ea 100644 (file)
--- a/log.c
+++ b/log.c
@@ -162,6 +162,13 @@ void cfgfatal_maybefile(FILE *maybe_f, struct cloc loc, cstring_t facility,
     va_end(args);
 }    
 
+void cfgfatal_cl_type(struct cloc loc, const char *facility,
+                     closure_t *cl, uint32_t exp_type, const char *name)
+{
+    assert(cl->type != exp_type);
+    cfgfatal(loc,facility,"\"%s\" is the wrong type of closure\n",name);
+}
+
 void cfgfatal(struct cloc loc, cstring_t facility, const char *message, ...)
 {
     va_list args;

diff --git a/secnet.h b/secnet.h
index b54df229e290b4b0e734f8becf0ec4b69ae232a3..743d1b37ea70ba558de71ea9ee748de27eeaf0e0 100644 (file)
--- a/secnet.h
+++ b/secnet.h
@@ -843,6 +843,10 @@ extern NORETURN(cfgfatal_maybefile(FILE *maybe_f, struct cloc loc,
                                   const char *message, ...))
     FORMAT(printf,4,5);
 
+extern NORETURN(cfgfatal_cl_type(struct cloc loc, const char *facility,
+                                closure_t *cl, uint32_t exp_type, 
+                                const char *name));
+
 extern void Message(uint32_t class, const char *message, ...)
     FORMAT(printf,2,3);
 extern void log_from_fd(int fd, cstring_t prefix, struct log_if *log);