r9023@Kushana: nickm | 2006-09-29 17:27:24 -0400

 Make distinct all non-bug messages at notice or higher that appear 3 or more times.


svn:r8541

2 files changed, 9 insertions, 9 deletions

diff --git a/src/common/torgzip.c b/src/common/torgzip.c
index 1d1fdc848d..2ffa47a510 100644
--- a/src/common/torgzip.c
+++ b/src/common/torgzip.c
@@ -79,7 +79,7 @@ tor_gzip_compress(char **out, size_t *out_len,
 
   if (method == GZIP_METHOD && !is_gzip_supported()) {
     /* Old zlib version don't support gzip in deflateInit2 */
-    log_warn(LD_GENERAL, "Gzip not supported with zlib %s", ZLIB_VERSION);
+    log_warn(LD_BUG, "Gzip not supported with zlib %s", ZLIB_VERSION);
     return -1;
   }
 
@@ -132,7 +132,7 @@ tor_gzip_compress(char **out, size_t *out_len,
  done:
   *out_len = stream->total_out;
   if (deflateEnd(stream)!=Z_OK) {
-    log_warn(LD_GENERAL, "Error freeing gzip structures");
+    log_warn(LD_BUG, "Error freeing gzip structures");
     goto err;
   }
   tor_free(stream);
@@ -178,7 +178,7 @@ tor_gzip_uncompress(char **out, size_t *out_len,
 
   if (method == GZIP_METHOD && !is_gzip_supported()) {
     /* Old zlib version don't support gzip in inflateInit2 */
-    log_warn(LD_GENERAL, "Gzip not supported with zlib %s", ZLIB_VERSION);
+    log_warn(LD_BUG, "Gzip not supported with zlib %s", ZLIB_VERSION);
     return -1;
   }
 
@@ -213,7 +213,7 @@ tor_gzip_uncompress(char **out, size_t *out_len,
           goto done;
         /* There may be more compressed data here. */
         if ((r = inflateEnd(stream)) != Z_OK) {
-          log_warn(LD_GENERAL, "Error freeing gzip structures");
+          log_warn(LD_BUG, "Error freeing gzip structures");
           goto err;
         }
         if (inflateInit2(stream, method_bits(method)) != Z_OK) {
@@ -251,7 +251,7 @@ tor_gzip_uncompress(char **out, size_t *out_len,
   r = inflateEnd(stream);
   tor_free(stream);
   if (r != Z_OK) {
-    log_warn(LD_GENERAL, "Error freeing gzip structures");
+    log_warn(LD_BUG, "Error freeing gzip structures");
     goto err;
   }
 
@@ -304,7 +304,7 @@ tor_zlib_new(int compress, compress_method_t method)
 
   if (method == GZIP_METHOD && !is_gzip_supported()) {
     /* Old zlib version don't support gzip in inflateInit2 */
-    log_warn(LD_GENERAL, "Gzip not supported with zlib %s", ZLIB_VERSION);
+    log_warn(LD_BUG, "Gzip not supported with zlib %s", ZLIB_VERSION);
     return NULL;
  }
 
diff --git a/src/common/util.c b/src/common/util.c
index 59be5ebb7b..5294103cd1 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -115,7 +115,7 @@ _tor_malloc(size_t size DMALLOC_PARAMS)
   result = dmalloc_malloc(file, line, size, DMALLOC_FUNC_MALLOC, 0, 0);
 
   if (PREDICT(result == NULL, 0)) {
-    log_err(LD_MM,"Out of memory. Dying.");
+    log_err(LD_MM,"Out of memory on malloc(). Dying.");
     /* If these functions die within a worker process, they won't call
      * spawn_exit, but that's ok, since the parent will run out of memory soon
      * anyway. */
@@ -147,7 +147,7 @@ _tor_realloc(void *ptr, size_t size DMALLOC_PARAMS)
 
   result = dmalloc_realloc(file, line, ptr, size, DMALLOC_FUNC_REALLOC, 0);
   if (PREDICT(result == NULL, 0)) {
-    log_err(LD_MM,"Out of memory. Dying.");
+    log_err(LD_MM,"Out of memory on realloc(). Dying.");
     exit(1);
   }
   return result;
@@ -165,7 +165,7 @@ _tor_strdup(const char *s DMALLOC_PARAMS)
 
   dup = dmalloc_strdup(file, line, s, 0);
   if (PREDICT(dup == NULL, 0)) {
-    log_err(LD_MM,"Out of memory. Dying.");
+    log_err(LD_MM,"Out of memory on strdup(). Dying.");
     exit(1);
   }
   return dup;