chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test-common: Use $(wildcard ) rather than $(shell echo )
[secnet.git]
/
log.c
diff --git
a/log.c
b/log.c
index 123961202abd5f42faacb0d987779bd612c26d91..3efd289fe67f9efc9051a07c84a2f83b58a06b51 100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-130,7
+130,8
@@
void fatal_perror_status(int status, const char *message, ...)
}
void vcfgfatal_maybefile(FILE *maybe_f /* or 0 */, struct cloc loc,
}
void vcfgfatal_maybefile(FILE *maybe_f /* or 0 */, struct cloc loc,
- cstring_t facility, const char *message, va_list args)
+ cstring_t facility, const char *message, va_list args,
+ const char *suffix)
{
enter_phase(PHASE_SHUTDOWN);
{
enter_phase(PHASE_SHUTDOWN);
@@
-152,6
+153,7
@@
void vcfgfatal_maybefile(FILE *maybe_f /* or 0 */, struct cloc loc,
}
vMessage(M_FATAL,message,args);
}
vMessage(M_FATAL,message,args);
+ Message(M_FATAL,"%s",suffix);
exit(current_phase);
}
exit(current_phase);
}
@@
-161,7
+163,7
@@
void cfgfatal_maybefile(FILE *maybe_f, struct cloc loc, cstring_t facility,
va_list args;
va_start(args,message);
va_list args;
va_start(args,message);
- vcfgfatal_maybefile(maybe_f,loc,facility,message,args);
+ vcfgfatal_maybefile(maybe_f,loc,facility,message,args
,0
);
va_end(args);
}
va_end(args);
}
@@
-170,10
+172,16
@@
void cfgfatal(struct cloc loc, cstring_t facility, const char *message, ...)
va_list args;
va_start(args,message);
va_list args;
va_start(args,message);
- vcfgfatal_maybefile(0,loc,facility,message,args);
+ vcfgfatal_maybefile(0,loc,facility,message,args
,""
);
va_end(args);
}
va_end(args);
}
+void cfgfile_log__vmsg(void *sst, int class, const char *message, va_list args)
+{
+ struct cfgfile_log *st=sst;
+ vcfgfatal_maybefile(0,st->loc,st->facility,message,args,"\n");
+}
+
void cfgfile_postreadcheck(struct cloc loc, FILE *f)
{
assert(loc.file);
void cfgfile_postreadcheck(struct cloc loc, FILE *f)
{
assert(loc.file);