6502/erc-c
1
0
Fork 0
mirror of https://github.com/pevans/erc-c.git synced 2025-01-02 09:29:58 +00:00
Code Issues Projects Releases Wiki Activity

Refactor a bit for easier testing; add log_stream()

Browse Source
This commit is contained in:
Peter Evans 2018-01-07 15:05:20 -06:00
parent 5da65e0a9e
commit 888eb25797
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/log.h
View File

@ -17,7 +17,8 @@ enum log_errcode {
ERR_GFXOP, // we couldn't execute a specific graphic operation ERR_GFXOP, // we couldn't execute a specific graphic operation
}; };
extern void log_close(); extern FILE *log_stream();
extern int log_close();
extern void log_open(FILE *); extern void log_open(FILE *);
extern void log_write(int, const char *, ...); extern void log_write(int, const char *, ...);

38
src/log.c
View File

@ -15,23 +15,28 @@
* any number of things, from a literal file on the filesystem, to * any number of things, from a literal file on the filesystem, to
* stdout. * stdout.
*/ */
static FILE *log_stream = NULL; static FILE *_stream = NULL;
/* /*
* Close the file stream we opened (or were given) in `log_open()`. * Close the file stream we opened (or were given) in `log_open()`.
* Nota bene: if you passed stdout into log_open(), this will actually * Nota bene: if you passed stdout into log_open(), this will actually
* _close_ the stdout stream (!). * _close_ the stdout stream (!).
*/ */
void int
log_close() log_close()
{ {
if (log_stream != NULL) { int rval = 0;
fclose(log_stream);
if (_stream != NULL) {
rval = fclose(_stream);
_stream = NULL;
} }
return rval;
} }
/* /*
* This function will assign the log_stream variable to either a given * This function will assign the _stream variable to either a given
* file stream, or if none given, to the default location (which is a * file stream, or if none given, to the default location (which is a
* filename defined by the `LOG_FILENAME` macro). * filename defined by the `LOG_FILENAME` macro).
*/ */
@ -40,13 +45,13 @@ log_open(FILE *stream)
{ {
// Oh, you're telling _me_ what the stream is? Neat! // Oh, you're telling _me_ what the stream is? Neat!
if (stream != NULL) { if (stream != NULL) {
log_stream = stream; _stream = stream;
return; return;
} }
// Oh, well. I'll just open this dang thing. // Oh, well. I'll just open this dang thing.
log_stream = fopen(LOG_FILENAME, "w"); _stream = fopen(LOG_FILENAME, "w");
if (log_stream == NULL) { if (_stream == NULL) {
perror("Couldn't open log file (" LOG_FILENAME ")"); perror("Couldn't open log file (" LOG_FILENAME ")");
exit(1); exit(1);
} }
@ -62,12 +67,21 @@ log_write(int level, const char *fmt, ...)
{ {
va_list ap; va_list ap;
if (log_stream == NULL) { if (_stream == NULL) {
log_stream = stdout; _stream = stdout;
} }
va_start(ap, fmt); va_start(ap, fmt);
vfprintf(log_stream, fmt, ap); vfprintf(_stream, fmt, ap);
fprintf(log_stream, "\n"); fprintf(_stream, "\n");
va_end(ap); va_end(ap);
} }
/*
* Return the file stream we're currently using for logging.
*/
FILE *
log_stream()
{
return _stream;
}