diff --git a/src/include/ZMap/zmapUtils.h b/src/include/ZMap/zmapUtils.h
index 3e26bfb21015250a0a5112a520ea6cdb90098bf9..7adac181fb2a85d25414a37dd9079388705173ea 100755
--- a/src/include/ZMap/zmapUtils.h
+++ b/src/include/ZMap/zmapUtils.h
@@ -24,9 +24,9 @@
*
* Description: Utility functions for ZMap.
* HISTORY:
- * Last edited: Jul 14 09:48 2006 (edgrif)
+ * Last edited: Nov 7 15:35 2006 (edgrif)
* Created: Thu Feb 26 10:33:10 2004 (edgrif)
- * CVS info: $Id: zmapUtils.h,v 1.23 2006-07-14 10:24:10 edgrif Exp $
+ * CVS info: $Id: zmapUtils.h,v 1.24 2006-11-07 17:00:06 edgrif Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_UTILS_H
@@ -42,13 +42,13 @@
#define ZMAP_MSG_FORMAT_STRING "(%s, %s(), line %d) - "
-#define ZMAP_MSG_FUNCTION_MACRO __PRETTY_FUNCTION__,
+#define ZMAP_MSG_FUNCTION_MACRO __FILE__, __PRETTY_FUNCTION__, __LINE__
#else /* __GNUC__ */
#define ZMAP_MSG_FORMAT_STRING "(%s, line %d) - "
-#define ZMAP_MSG_FUNCTION_MACRO
+#define ZMAP_MSG_FUNCTION_MACRO __FILE__, __LINE__
#endif /* __GNUC__ */
diff --git a/src/include/ZMap/zmapUtilsCheck.h b/src/include/ZMap/zmapUtilsCheck.h
index e93d8634a11f15a8b3f07b46c07383c3672553fe..308e3b1943a036e167a6237aaddca47ef13ad053 100755
--- a/src/include/ZMap/zmapUtilsCheck.h
+++ b/src/include/ZMap/zmapUtilsCheck.h
@@ -26,9 +26,9 @@
* code.
*
* HISTORY:
- * Last edited: Apr 8 17:09 2004 (edgrif)
+ * Last edited: Nov 7 15:39 2006 (edgrif)
* Created: Mon Mar 29 16:51:28 2004 (edgrif)
- * CVS info: $Id: zmapUtilsCheck.h,v 1.1 2004-04-08 16:14:53 edgrif Exp $
+ * CVS info: $Id: zmapUtilsCheck.h,v 1.2 2006-11-07 17:00:06 edgrif Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_UTILS_CHECK_H
@@ -38,13 +38,6 @@
#include <glib.h>
-#ifdef HOME
-
-#define zMapCheck(EXPR, FORMAT, ...)
-
-#else
-
-
/* Use to test functions, e.g.
* zmapCheck(myfunc("x y z"), "%s", "disaster, my func should never fail") ;
* */
@@ -53,9 +46,7 @@ G_STMT_START{ \
if ((EXPR)) \
{ \
g_printerr(ZMAP_MSG_FORMAT_STRING " '%s' " FORMAT, \
- __FILE__, \
- ZMAP_MSG_FUNCTION_MACRO \
- __LINE__, \
+ ZMAP_MSG_FUNCTION_MACRO, \
#EXPR, \
__VA_ARGS__); \
exit(EXIT_FAILURE) ; \
@@ -63,6 +54,4 @@ G_STMT_START{ \
}G_STMT_END
-#endif /*HOME*/
-
#endif /* ZMAP_UTILS_CHECK_H */
diff --git a/src/include/ZMap/zmapUtilsLog.h b/src/include/ZMap/zmapUtilsLog.h
index 911b434f18f45e7389e53f3b7a12cd212c6dcfff..36cd3d748b22aa79bc2753b08b68664fa5b06ebc 100755
--- a/src/include/ZMap/zmapUtilsLog.h
+++ b/src/include/ZMap/zmapUtilsLog.h
@@ -25,9 +25,9 @@
* Description: Contains macros, functions etc. for logging.
*
* HISTORY:
- * Last edited: May 7 09:40 2004 (edgrif)
+ * Last edited: Nov 7 15:37 2006 (edgrif)
* Created: Mon Mar 29 16:51:28 2004 (edgrif)
- * CVS info: $Id: zmapUtilsLog.h,v 1.2 2004-05-07 09:17:20 edgrif Exp $
+ * CVS info: $Id: zmapUtilsLog.h,v 1.3 2006-11-07 17:00:06 edgrif Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_UTILS_LOG_H
@@ -48,17 +48,6 @@
#include <glib.h>
-
-#ifdef EDG_HOME
-
-#define zMapLogFatal(FORMAT, ...)
-
-#define zMapLogFatalSysErr(ERRNO, FORMAT, ...)
-
-
-#else
-
-
/* Use these macros like this:
*
* zMapLogXXXX("%s is about to %s", str, str) ;
@@ -74,37 +63,29 @@
g_log(ZMAPLOG_DOMAIN, \
G_LOG_LEVEL_MESSAGE, \
ZMAP_MSG_FORMAT_STRING FORMAT, \
- __FILE__, \
- ZMAP_MSG_FUNCTION_MACRO \
- __LINE__, \
- __VA_ARGS__)
+ ZMAP_MSG_FUNCTION_MACRO, \
+ __VA_ARGS__)
#define zMapLogWarning(FORMAT, ...) \
g_log(ZMAPLOG_DOMAIN, \
G_LOG_LEVEL_WARNING, \
ZMAP_MSG_FORMAT_STRING FORMAT, \
- __FILE__, \
- ZMAP_MSG_FUNCTION_MACRO \
- __LINE__, \
- __VA_ARGS__)
+ ZMAP_MSG_FUNCTION_MACRO, \
+ __VA_ARGS__)
#define zMapLogCritical(FORMAT, ...) \
g_log(ZMAPLOG_DOMAIN, \
G_LOG_LEVEL_CRITICAL, \
ZMAP_MSG_FORMAT_STRING FORMAT, \
- __FILE__, \
- ZMAP_MSG_FUNCTION_MACRO \
- __LINE__, \
- __VA_ARGS__)
+ ZMAP_MSG_FUNCTION_MACRO, \
+ __VA_ARGS__)
#define zMapLogFatal(FORMAT, ...) \
g_log(ZMAPLOG_DOMAIN, \
G_LOG_LEVEL_ERROR, \
ZMAP_MSG_FORMAT_STRING FORMAT, \
- __FILE__, \
- ZMAP_MSG_FUNCTION_MACRO \
- __LINE__, \
- __VA_ARGS__)
+ ZMAP_MSG_FUNCTION_MACRO, \
+ __VA_ARGS__)
/* Use this macro like this:
@@ -116,13 +97,9 @@
g_log(ZMAPLOG_DOMAIN, \
G_LOG_LEVEL_ERROR, \
ZMAP_MSG_FORMAT_STRING FORMAT " (errno = \"%s\")", \
- __FILE__, \
- ZMAP_MSG_FUNCTION_MACRO \
- __LINE__, \
- __VA_ARGS__, \
+ ZMAP_MSG_FUNCTION_MACRO, \
+ __VA_ARGS__, \
g_strerror(ERRNO))
-#endif /*HOME*/
-
#endif /* ZMAP_UTILS_LOG_H */
diff --git a/src/include/ZMap/zmapUtilsMesg.h b/src/include/ZMap/zmapUtilsMesg.h
index f4a6fa74584215ff7b6d077b0c79f30afb144d44..13403b45ac5fb1e1b3f76ab4b7295c8ada657eed 100755
--- a/src/include/ZMap/zmapUtilsMesg.h
+++ b/src/include/ZMap/zmapUtilsMesg.h
@@ -26,9 +26,9 @@
* in production code.
*
* HISTORY:
- * Last edited: Nov 15 14:09 2004 (edgrif)
+ * Last edited: Nov 7 15:38 2006 (edgrif)
* Created: Mon Mar 29 18:23:48 2004 (edgrif)
- * CVS info: $Id: zmapUtilsMesg.h,v 1.2 2004-11-19 13:47:47 edgrif Exp $
+ * CVS info: $Id: zmapUtilsMesg.h,v 1.3 2006-11-07 17:00:06 edgrif Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_UTILS_MESG_H
@@ -40,21 +40,9 @@
/* Can call the message routine directly but better to use the macros below. */
typedef enum {ZMAP_MSG_INFORMATION, ZMAP_MSG_WARNING, ZMAP_MSG_EXIT, ZMAP_MSG_CRASH} ZMapMsgType ;
-void zMapShowMsg(ZMapMsgType msg_type, char *format, ...) ;
-
-
-#ifdef HOME
-
-#define zMapMessage(FORMAT, ...)
-
-#define zMapWarning(FORMAT, ...)
-
-#define zMapExit(FORMAT, ...)
-
-#define zMapCrash(FORMAT, ...)
+void zMapShowMsg(ZMapMsgType msg_type, char *format, ...) ;
-#else
/* Informational messages. */
@@ -76,9 +64,7 @@ G_STMT_START{ \
G_STMT_START{ \
zMapShowMsg(ZMAP_MSG_EXIT, \
ZMAP_MSG_FORMAT_STRING FORMAT, \
- __FILE__, \
- ZMAP_MSG_FUNCTION_MACRO \
- __LINE__, \
+ ZMAP_MSG_FUNCTION_MACRO, \
__VA_ARGS__) ; \
}G_STMT_END
@@ -88,14 +74,10 @@ G_STMT_START{ \
G_STMT_START{ \
zMapShowMsg(ZMAP_MSG_CRASH, \
ZMAP_MSG_FORMAT_STRING FORMAT, \
- __FILE__, \
- ZMAP_MSG_FUNCTION_MACRO \
- __LINE__, \
+ ZMAP_MSG_FUNCTION_MACRO, \
__VA_ARGS__) ; \
}G_STMT_END
-#endif /*HOME*/
-
#endif /* ZMAP_UTILS_MESG_H */