chiark
/
gitweb
/
~ianmdlvl
/
sympathy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[sympathy.git]
/
src
/
log.c
diff --git
a/src/log.c
b/src/log.c
index 65860f38142c68f4c073ecda9fbcee12149dbae2..0f96964a2096e0be32e16fc602573be5555cc6a8 100644
(file)
--- a/
src/log.c
+++ b/
src/log.c
@@
-10,6
+10,9
@@
static char rcsid[] = "$Id$";
/*
* $Log$
/*
* $Log$
+ * Revision 1.3 2008/02/23 11:48:37 james
+ * *** empty log message ***
+ *
* Revision 1.2 2008/02/22 14:51:54 james
* *** empty log message ***
*
* Revision 1.2 2008/02/22 14:51:54 james
* *** empty log message ***
*
@@
-74,28
+77,32
@@
file_log_new (char *fn)
{
File_Log *l;
FILE *f;
{
File_Log *l;
FILE *f;
- int dc
=
1;
+ int dc
=
1;
- if (fn && strcmp(fn,"-")) {
- f = fopen (fn, "a+");
- if (!f)
- return NULL;
- } else {
- f=stderr;
- dc=0;
- }
+ if (fn && strcmp (fn, "-"))
+ {
+ f = fopen (fn, "a+");
+ if (!f)
+ return NULL;
+ }
+ else
+ {
+ f = stderr;
+ dc = 0;
+ }
l = malloc (sizeof (File_Log));
l->log = flog_log;
l->close = flog_close;
l->fp = f;
l = malloc (sizeof (File_Log));
l->log = flog_log;
l->close = flog_close;
l->fp = f;
- l->do_close
=
dc;
+ l->do_close
=
dc;
return (Log *) l;
}
return (Log *) l;
}
-void
-log_f (Log *log,char *fmt, ...)
+
+void
+log_f (Log * log, char *fmt, ...)
{
int n;
{
int n;
@@
-103,12
+110,14
@@
log_f (Log *log,char *fmt, ...)
va_list ap;
static int size;
va_list ap;
static int size;
- if (!log) return;
+ if (!log)
+ return;
- if (!size) {
- size = 128;
- buf = malloc (size);
- }
+ if (!size)
+ {
+ size = 128;
+ buf = malloc (size);
+ }
if (!buf)
return;
if (!buf)
return;
@@
-116,13
+125,14
@@
log_f (Log *log,char *fmt, ...)
while (1)
{
va_start (ap, fmt);
while (1)
{
va_start (ap, fmt);
- n = vsnprintf (buf
, size, fmt, ap);
+ n = vsnprintf (buf, size, fmt, ap);
va_end (ap);
va_end (ap);
- if (n > -1 && n < size) {
- log->log(log,buf);
- return;
- }
+ if (n > -1 && n < size)
+ {
+ log->log (log, buf);
+ return;
+ }
if (n > -1) /* glibc 2.1 */
size = n + 1;
if (n > -1) /* glibc 2.1 */
size = n + 1;
@@
-132,6
+142,6
@@
log_f (Log *log,char *fmt, ...)
buf = realloc (buf, size);
if (!buf)
buf = realloc (buf, size);
if (!buf)
- return;
+
return;
}
}
}
}