Merge branch 'maint'

[paraslash.git] / daemon.c

diff --git a/daemon.c b/daemon.c
index b0d8fd744c8f7f0d208afd5f96ca03fe336ece16..d8b8519e42cbf20f32bdcde30055a807793e8c7a 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2014 Andre Noll <maan@tuebingen.mpg.de>
+ * Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -122,18 +122,6 @@ void daemon_set_flag(unsigned flag)
        me->flags |= flag;
 }
 
-/**
- * Clear one of the daemon config flags.
- *
- * \param flag The flag to clear.
- *
- * \sa \ref daemon_flags.
- */
-void daemon_clear_flag(unsigned flag)
-{
-       me->flags &= ~flag;
-}
-
 static bool daemon_test_flag(unsigned flag)
 {
        return me->flags & flag;
@@ -223,7 +211,8 @@ void daemon_open_log_or_die(void)
                        strerror(errno));
                exit(EXIT_FAILURE);
        }
-       setlinebuf(me->logfile);
+       /* equivalent to setlinebuf(), but portable */
+       setvbuf(me->logfile, NULL, _IOLBF, 0);
 }
 
 /**