X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/212380e3f42f585dc1ea927402252eb943f91f7b..a5497589929c9482cf26b39ceab0b1a45e8462a3:/src/s_log.c?ds=sidebyside

diff --git a/src/s_log.c b/src/s_log.c
index 129d224..b48ee6f 100644
--- a/src/s_log.c
+++ b/src/s_log.c
@@ -28,7 +28,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: s_log.c 1563 2006-06-02 00:43:35Z nenolod $
+ * $Id: s_log.c 3209 2007-02-11 16:54:43Z jilles $
  */
 
 #include "stdinc.h"
@@ -77,7 +77,7 @@ void
 init_main_logfile(void)
 {
 	if(log_main == NULL)
-		log_main = fopen(LPATH, "a");
+		log_main = fopen(logFileName, "a");
 }
 
 void
@@ -88,7 +88,7 @@ open_logfiles(void)
 	if(log_main != NULL)
 		fclose(log_main);
 
-	log_main = fopen(LPATH, "a");
+	log_main = fopen(logFileName, "a");
 
 	/* log_main is handled above, so just do the rest */
 	for(i = 1; i < LAST_LOGFILE; i++)
@@ -118,10 +118,10 @@ ilog(ilogfile dest, const char *format, ...)
 		return;
 
 	va_start(args, format);
-	ircvsnprintf(buf, sizeof(buf), format, args);
+	rb_vsnprintf(buf, sizeof(buf), format, args);
 	va_end(args);
 
-	ircsnprintf(buf2, sizeof(buf2), "%s %s\n", smalldate(), buf);
+	rb_snprintf(buf2, sizeof(buf2), "%s %s\n", smalldate(), buf);
 
 	if(fputs(buf2, logfile) < 0)
 	{
@@ -148,7 +148,7 @@ inotice(const char *format, ...)
 	va_list args;
 
 	va_start(args, format);
-	ircvsnprintf(buf, sizeof(buf), format, args);
+	rb_vsnprintf(buf, sizeof(buf), format, args);
 	va_end(args);
 
 	_iprint("notice", buf);
@@ -163,7 +163,7 @@ iwarn(const char *format, ...)
 	va_list args;
 
 	va_start(args, format);
-	ircvsnprintf(buf, sizeof(buf), format, args);
+	rb_vsnprintf(buf, sizeof(buf), format, args);
 	va_end(args);
 
 	_iprint("warning", buf);
@@ -178,7 +178,7 @@ ierror(const char *format, ...)
 	va_list args;
 
 	va_start(args, format);
-	ircvsnprintf(buf, sizeof(buf), format, args);
+	rb_vsnprintf(buf, sizeof(buf), format, args);
 	va_end(args);
 
 	_iprint("error", buf);
@@ -210,11 +210,11 @@ smalldate(void)
 {
 	static char buf[MAX_DATE_STRING];
 	struct tm *lt;
-	time_t ltime = CurrentTime;
+	time_t ltime = rb_current_time();
 
 	lt = localtime(&ltime);
 
-	ircsnprintf(buf, sizeof(buf), "%d/%d/%d %02d.%02d",
+	rb_snprintf(buf, sizeof(buf), "%d/%d/%d %02d.%02d",
 		    lt->tm_year + 1900, lt->tm_mon + 1,
 		    lt->tm_mday, lt->tm_hour, lt->tm_min);