X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=logging.h;h=6e1d5a20ef7d7f28faade207c422686f21182bf1;hp=904355cb2cf4fa4f590f3bcd7f950069ca95cefe;hb=83a4c0f8b8981fb31cb6db70fcbe3a1f62c1913e;hpb=6b493a20e1dbf90a4e54d3be37027fa906220c31

diff --git a/logging.h b/logging.h
index 904355cb2..6e1d5a20e 100644
--- a/logging.h
+++ b/logging.h
@@ -1,10 +1,8 @@
 /*
- * logging.h
+ * simple logging functions that can be expanded into nothing
  *
- * Simple logging functions that can be compiled away into nothing.
- *
- * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
@@ -17,7 +15,7 @@
  * 
  *	You should have received a copy of the GNU General Public License along
  *	with this program; if not, write to the Free Software Foundation, Inc.,
- *	675 Mass Ave, Cambridge, MA 02139, USA.
+ *	51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -38,13 +36,13 @@
 #undef err
 #define err(format, arg...)							\
 	do {									\
-		log_message(LOG_INFO ,"%s: " format ,__FILE__ ,## arg);		\
+		log_message(LOG_ERR ,"%s: " format ,__FUNCTION__ ,## arg);	\
 	} while (0)
 
 #undef info
 #define info(format, arg...)							\
 	do {									\
-		log_message(LOG_INFO ,"%s: " format ,__FILE__ ,## arg);		\
+		log_message(LOG_INFO ,"%s: " format ,__FUNCTION__ ,## arg);	\
 	} while (0)
 
 #ifdef DEBUG
@@ -61,7 +59,7 @@ extern void log_message(int priority, const char *format, ...)
 #undef logging_init
 static inline void logging_init(const char *program_name)
 {
-	openlog(program_name, LOG_PID, LOG_DAEMON);
+	openlog(program_name, LOG_PID | LOG_CONS, LOG_DAEMON);
 }
 
 #undef logging_close