mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-17 17:52:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

use logfile as variable name as cocoa gives an error about the symbol type of logf

Browse Source
This commit is contained in:
Vincent Sanders 2015-05-29 16:32:12 +01:00
parent faf9b9d919
commit 25d7f0c657
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
utils/log.c
View File

@ -30,7 +30,7 @@
bool verbose_log = false; bool verbose_log = false;
/** The stream to which logging is sent */ /** The stream to which logging is sent */
static FILE *logf; static FILE *logfile;
nserror nslog_init(nslog_ensure_t *ensure, int *pargc, char **argv) nserror nslog_init(nslog_ensure_t *ensure, int *pargc, char **argv)
{ {
@ -43,7 +43,7 @@ nserror nslog_init(nslog_ensure_t *ensure, int *pargc, char **argv)
int argcmv; int argcmv;
/* verbose logging to stderr */ /* verbose logging to stderr */
logf = stderr; logfile = stderr;
/* remove -v from argv list */ /* remove -v from argv list */
for (argcmv = 2; argcmv < (*pargc); argcmv++) { for (argcmv = 2; argcmv < (*pargc); argcmv++) {
@ -60,7 +60,7 @@ nserror nslog_init(nslog_ensure_t *ensure, int *pargc, char **argv)
int argcmv; int argcmv;
/* verbose logging to file */ /* verbose logging to file */
logf = fopen(argv[2], "a+"); logfile = fopen(argv[2], "a+");
/* remove -V and filename from argv list */ /* remove -V and filename from argv list */
for (argcmv = 3; argcmv < (*pargc); argcmv++) { for (argcmv = 3; argcmv < (*pargc); argcmv++) {
@ -68,7 +68,7 @@ nserror nslog_init(nslog_ensure_t *ensure, int *pargc, char **argv)
} }
(*pargc)--; (*pargc)--;
if (logf == NULL) { if (logfile == NULL) {
/* could not open log file for output */ /* could not open log file for output */
ret = NSERROR_NOT_FOUND; ret = NSERROR_NOT_FOUND;
verbose_log = false; verbose_log = false;
@ -82,7 +82,7 @@ nserror nslog_init(nslog_ensure_t *ensure, int *pargc, char **argv)
/* ensure output file handle is correctly configured */ /* ensure output file handle is correctly configured */
if ((verbose_log == true) && if ((verbose_log == true) &&
(ensure != NULL) && (ensure != NULL) &&
(ensure(logf) == false)) { (ensure(logfile) == false)) {
/* failed to ensure output configuration */ /* failed to ensure output configuration */
ret = NSERROR_INIT_FAILED; ret = NSERROR_INIT_FAILED;
verbose_log = false; verbose_log = false;
@ -152,15 +152,15 @@ void nslog_log(const char *file, const char *func, int ln, const char *format, .
{ {
va_list ap; va_list ap;
fprintf(logf, "%s %s:%i %s: ", nslog_gettime(), file, ln, func); fprintf(logfile, "%s %s:%i %s: ", nslog_gettime(), file, ln, func);
va_start(ap, format); va_start(ap, format);
vfprintf(logf, format, ap); vfprintf(logfile, format, ap);
va_end(ap); va_end(ap);
fputc('\n', logf); fputc('\n', logfile);
} }
#endif #endif