Removed a temporary hack to vlprintf() that displayed the

address of the currently bound CitContext.   Updated the
internal version number to 7.32 because we are going to have
to push an emergency update.

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 3ea8b00634a1fb1f2dcc9edfdbb0c553644303b0..9d380de42558b089de06740e4ccd443269a79fb0 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -47,7 +47,7 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL      730             /* This version */
+#define REV_LEVEL      732             /* This version */
 #define REV_MIN                591             /* Oldest compatible database */
 #define EXPORT_REV_MIN 725             /* Oldest compatible export files */
 #define LIBCITADEL_MIN 105             /* Minimum required version of libcitadel */

diff --git a/citadel/configure.ac b/citadel/configure.ac
index f64895f0579ddcda6d794a993addfbc8a4167d14..0dd01603120e1bcdccd40c0d4b98e83c008fb9d0 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl $Id$
 AC_PREREQ(2.52)
-AC_INIT([Citadel], [7.31], [http://www.citadel.org/])
+AC_INIT([Citadel], [7.32], [http://www.citadel.org/])
 AC_REVISION([$Revision: 5108 $])
 AC_CONFIG_SRCDIR([citserver.c])
 AC_PREFIX_DEFAULT(/usr/local/citadel)

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index c55c0ca6906e760c6363adf7f6f8810ada6148cf..164cafd5a70e2e530d888cb2b4df3695d5fb057e 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -141,7 +141,6 @@ void vlprintf(enum LogLevel loglevel, const char *format, va_list arg_ptr)
                /* Promote to time_t; types differ on some OSes (like darwin) */
                unixtime = tv.tv_sec;
                localtime_r(&unixtime, &tim);
-/*
                if (CC->cs_pid != 0) {
                        sprintf(buf,
                                "%04d/%02d/%02d %2d:%02d:%02d.%06ld [%3d] ",
@@ -156,11 +155,6 @@ void vlprintf(enum LogLevel loglevel, const char *format, va_list arg_ptr)
                                tim.tm_mday, tim.tm_hour, tim.tm_min,
                                tim.tm_sec, (long)tv.tv_usec);
                }
-FIXME temp i want to see CC */
-                       sprintf(buf,
-                               "%2d:%02d:%02d.%06ld 0x%08lx ",
-                               tim.tm_hour, tim.tm_min,
-                               tim.tm_sec, (long)tv.tv_usec, CC);
                vsnprintf(buf2, SIZ, format, arg_ptr);   
 
                fprintf(stderr, "%s%s", buf, buf2);