Fix warnings

diff --git a/comstack/unix.c b/comstack/unix.c
index a3d4e58..7666b29 100644 (file)
--- a/comstack/unix.c
+++ b/comstack/unix.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2002, Index Data
  * See the file LICENSE for details.
  *
- * $Id: unix.c,v 1.1 2002-06-04 11:36:10 adam Exp $
+ * $Id: unix.c,v 1.2 2002-06-18 21:30:38 adam Exp $
  * UNIX socket COMSTACK. By Morten Bøgeskov.
  */
 #ifndef WIN32
@@ -143,11 +143,6 @@ COMSTACK unix_type(int s, int blocking, int protocol, void *vp)
 
 int unix_strtoaddr_ex(const char *str, struct sockaddr_un *add)
 {
-    struct hostent *hp;
-    char *p, buf[512];
-    short int port = 210;
-    unsigned tmpadd;
-
     if (!unix_init ())
        return 0;
     TRC(fprintf(stderr, "unix_strtoaddress: %s\n", str ? str : "NULL"));
@@ -227,7 +222,6 @@ int unix_connect(COMSTACK h, void *address)
  */
 int unix_rcvconnect(COMSTACK h)
 {
-    unix_state *sp = (unix_state *)h->cprivate;
     TRC(fprintf(stderr, "unix_rcvconnect\n"));
 
     if (h->state == CS_ST_DATAXFER)
@@ -248,7 +242,6 @@ int unix_rcvconnect(COMSTACK h)
 int unix_bind(COMSTACK h, void *address, int mode)
 {
     struct sockaddr *addr = (struct sockaddr *)address;
-    unsigned long one = 1;
     const char * path = ((struct sockaddr_un *)addr)->sun_path;
     struct stat stat_buf;
 

diff --git a/include/yaz/log.h b/include/yaz/log.h
index 0733f0b..22f7ada 100644 (file)
--- a/include/yaz/log.h
+++ b/include/yaz/log.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995-2000, Index Data.
+ * Copyright (c) 1995-2002, Index Data.
  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation, in whole or in part, for any purpose, is hereby granted,
@@ -23,7 +23,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  *
- * $Id: log.h,v 1.5 2002-04-16 13:04:20 heikki Exp $
+ * $Id: log.h,v 1.6 2002-06-18 21:30:39 adam Exp $
  */
 
 #ifndef LOG_H
@@ -44,7 +44,7 @@ YAZ_BEGIN_CDECL
 #define LOG_APP    0x0040     /* For application level events such as new-connection */
 #define LOG_MALLOC 0x0080     /* debugging mallocs */
 
-#define LOG_ALL   0xffff
+#define LOG_ALL   0xff7f
 
 #define LOG_DEFAULT_LEVEL (LOG_FATAL | LOG_ERRNO | LOG_LOG | LOG_WARN)
 

diff --git a/server/seshigh.c b/server/seshigh.c
index ccf44e0..2be36c1 100644 (file)
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2002, Index Data
  * See the file LICENSE for details.
  *
- * $Id: seshigh.c,v 1.129 2002-04-18 13:18:47 adam Exp $
+ * $Id: seshigh.c,v 1.130 2002-06-18 21:30:39 adam Exp $
  */
 
 /*
@@ -167,6 +167,7 @@ void destroy_association(association *h)
     request_delq(&h->incoming);
     request_delq(&h->outgoing);
     xfree(h);
+    xmalloc_trav("session closed");
     if (control_block && control_block->one_shot)
        exit (0);
 }

diff --git a/util/log.c b/util/log.c
index 6af4b09..46412af 100644 (file)
--- a/util/log.c
+++ b/util/log.c
@@ -1,118 +1,8 @@
 /*
- * Copyright (c) 1995-2000, Index Data
+ * Copyright (c) 1995-2002, Index Data
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: log.c,v $
- * Revision 1.26  2002-01-03 10:23:33  adam
- * Using _vsnprintf on WIN32.
- *
- * Revision 1.25  2001/08/23 09:02:46  adam
- * WIN32 fixes: Socket not re-used for bind. yaz_log logs WIN32 error
- * message.
- *
- * Revision 1.24  2000/09/04 08:58:15  adam
- * Added prefix yaz_ for most logging utility functions.
- *
- * Revision 1.23  2000/03/14 09:06:11  adam
- * Added POSIX threads support for frontend server.
- *
- * Revision 1.22  2000/02/29 13:44:55  adam
- * Check for config.h (currently not generated).
- *
- * Revision 1.21  2000/02/28 11:20:06  adam
- * Using autoconf. New definitions: YAZ_BEGIN_CDECL/YAZ_END_CDECL.
- *
- * Revision 1.20  1999/11/30 13:47:12  adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.19  1999/08/27 09:40:32  adam
- * Renamed logf function to yaz_log. Removed VC++ project files.
- *
- * Revision 1.18  1998/10/28 10:27:00  adam
- * New functions log_init_file, log_init_level, log_init_prefix.
- *
- * Revision 1.17  1997/12/09 16:11:02  adam
- * Assume strerror is defined on Unixes as well. It's standard ANSI.
- *
- * Revision 1.16  1997/10/06 08:55:07  adam
- * Changed log_init so that previous (if any) is closed.
- *
- * Revision 1.15  1997/09/29 07:13:13  adam
- * Minor changes.
- *
- * Revision 1.14  1997/09/18 08:48:09  adam
- * Fixed minor bug that caused log_init to ignore filename.
- *
- * Revision 1.13  1997/09/01 08:54:13  adam
- * New windows NT/95 port using MSV5.0. Made prefix query handling
- * thread safe. The function options ignores empty arguments when met.
- *
- * Revision 1.12  1997/05/01 15:08:14  adam
- * Added log_mask_str_x routine.
- *
- * Revision 1.11  1996/02/05 12:24:32  adam
- * Implemented log_event_{start,end}-functions.
- *
- * Revision 1.10  1995/12/06  09:51:27  quinn
- * Fixed the log-prefix buffer - it was too small and the setup code lacked
- * a bounds-check.
- *
- * Revision 1.9  1995/09/29  17:12:34  quinn
- * Smallish
- *
- * Revision 1.8  1995/09/27  15:03:02  quinn
- * Modified function heads & prototypes.
- *
- * Revision 1.7  1995/06/19  12:40:18  quinn
- * Added log_file()
- *
- * Revision 1.6  1995/06/15  15:45:03  quinn
- * Added date info.
- *
- * Revision 1.5  1995/05/16  08:51:11  quinn
- * License, documentation, and memory fixes
- *
- * Revision 1.4  1995/05/15  11:56:55  quinn
- * Debuggng & adjustments.
- *
- * Revision 1.3  1995/04/10  10:23:51  quinn
- * Fixes.
- *
- * Revision 1.2  1995/03/31  10:16:55  quinn
- * Fixed logging.
- *
- * Revision 1.1  1995/03/30  10:26:53  quinn
- * Logging system
- *
- * Revision 1.9  1994/12/12  12:09:02  quinn
- * Changes
- *
- * Revision 1.8  1994/11/22  13:15:38  quinn
- * Simple
- *
- * Revision 1.7  1994/10/05  10:16:11  quinn
- * Added xrealloc. Fixed bug in log.
- *
- * Revision 1.6  1994/10/04  14:02:19  quinn
- * Fixed log_init
- *
- * Revision 1.5  1994/09/28  13:07:41  adam
- * Implemented log_mask_str.
- *
- * Revision 1.4  1994/09/27  20:04:13  quinn
- * Added fflush.
- *
- * Revision 1.3  1994/08/18  08:18:48  quinn
- * Added prefix to log_init.
- *
- * Revision 1.2  1994/08/17  14:27:53  quinn
- * added LOG_ERRNO
- *
- * Revision 1.1  1994/08/17  13:23:15  quinn
- * First version
- * Added log.c
  *
+ * $Id: log.c,v 1.27 2002-06-18 21:30:39 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -147,7 +37,7 @@ char *strerror(int n)
 
 static int l_level = LOG_DEFAULT_LEVEL;
 static FILE *l_file = NULL;
-static char l_prefix[512] = "log";
+static char l_prefix[512] = "";
 
 static struct {
     int mask;
@@ -159,6 +49,7 @@ static struct {
     { LOG_WARN,  "warn" },
     { LOG_LOG,   "log"  },
     { LOG_ERRNO, ""},
+    { LOG_MALLOC, "malloc"},
     { LOG_ALL,   "all"  },
     { 0,         "none" },
     { 0, NULL }
@@ -196,7 +87,9 @@ void yaz_log_init_level (int level)
 void yaz_log_init_prefix (const char *prefix)
 {
     if (prefix && *prefix)
-       sprintf(l_prefix, "%.512s", prefix);
+       sprintf(l_prefix, "%.511s ", prefix);
+    else
+        *l_prefix = 0;
 }
 
 void yaz_log_init(int level, const char *prefix, const char *fname)
@@ -283,7 +176,7 @@ void yaz_log(int level, const char *fmt, ...)
     ti = time(0);
     tim = localtime(&ti);
     strftime(tbuf, 50, "%H:%M:%S-%d/%m", tim);
-    fprintf(l_file, "%s: %s: %s %s\n", tbuf, l_prefix, flags, buf);
+    fprintf(l_file, "%s: %s%s %s\n", tbuf, l_prefix, flags, buf);
     fflush(l_file);
     if (end_hook_func)
        (*end_hook_func)(o_level, buf, end_hook_info);

diff --git a/util/xmalloc.c b/util/xmalloc.c
index 60dbc2c..dc9b431 100644 (file)
--- a/util/xmalloc.c
+++ b/util/xmalloc.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1994-2001, Index Data
+ * Copyright (C) 1994-2002, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Id: xmalloc.c,v 1.16 2002-04-16 13:04:20 heikki Exp $
+ * $Id: xmalloc.c,v 1.17 2002-06-18 21:30:39 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -184,15 +184,15 @@ void xmalloc_trav_d(const char *file, int line)
     size_t size = 0;
     struct dmalloc_info *dinfo = dmalloc_list;
     
-    yaz_log (LOG_LOG, "malloc_trav %s:%d", file, line);
+    yaz_log (LOG_MALLOC, "malloc_trav %s:%d", file, line);
     while (dinfo)
     {
-       yaz_log (LOG_LOG, " %20s:%d p=%p size=%d", dinfo->file, dinfo->line,
+       yaz_log (LOG_MALLOC, " %20s:%d p=%p size=%d", dinfo->file, dinfo->line,
              ((char*) dinfo)+sizeof(*dinfo)+4*sizeof(char), dinfo->len);
        size += dinfo->len;
        dinfo = dinfo->next;
     }
-    yaz_log (LOG_LOG, "total bytes %ld", (long) size);
+    yaz_log (LOG_MALLOC, "total bytes %ld", (long) size);
 }
 
 #else