fixes

diff --git a/libatalk/util/logger.c b/libatalk/util/logger.c
index e5c97eb461399a5cd8103bd5403491535699b6e3..5f1c4a727ee33233cd82a75f439b0cd20efc5a29 100644 (file)
--- a/libatalk/util/logger.c
+++ b/libatalk/util/logger.c
@@ -554,14 +554,9 @@ void make_log_entry(enum loglevels loglevel, enum logtypes logtype,
                 /* yes, log it and remove from array */
 
                 /* reusing log_details_buffer */
-                sprintf(log_details_buffer, "message repeated %i times: ", LOG_FLOODING_MAXCOUNT - 1);
-                iov[0].iov_base = log_details_buffer;
-                iov[0].iov_len = strlen(log_details_buffer);
-                iov[1].iov_base = temp_buffer;
-                iov[1].iov_len = strlen(temp_buffer);
-
-                /* Write "message repeated x times: ..." to log */
-                writev( fd, iov, 2);
+                sprintf(log_details_buffer, "message repeated %i times\n",
+                        LOG_FLOODING_MAXCOUNT - 1);
+                write(fd, log_details_buffer, strlen(log_details_buffer));
 
                 if ((i + 1) == LOG_FLOODING_ARRAY_SIZE) {
                     /* last array element, just decrement count */
@@ -589,7 +584,6 @@ void make_log_entry(enum loglevels loglevel, enum logtypes logtype,
             /* reusing log_details_buffer */
             sprintf(log_details_buffer, "message repeated %i times\n",
                     log_flood_array[0].count - LOG_FLOODING_MINCOUNT + 1);
-            /* Write "message repeated x times: ..." to log */
             write(fd, log_details_buffer, strlen(log_details_buffer));
         }
         for (int i = 1; i < LOG_FLOODING_ARRAY_SIZE; i++) {

diff --git a/libatalk/util/test/logger_test.c b/libatalk/util/test/logger_test.c
index 5f536b947c8eae7569dc521c02293368f4f1984a..a968cce3ea802930b2b91e946f3af88eb191e348 100644 (file)
--- a/libatalk/util/test/logger_test.c
+++ b/libatalk/util/test/logger_test.c
@@ -40,18 +40,22 @@ int main(int argc, char *argv[])
   for (int i = 0; i < 3; i++) {
       LOG(log_debug, logtype_default, "Flooding...");
   }
-  LOG(log_debug, logtype_default, "1");
-  LOG(log_debug, logtype_default, "2");
-  LOG(log_debug, logtype_default, "3");
+  /* wipe the array */
+  LOG(log_debug, logtype_default, "1"); LOG(log_debug, logtype_default, "2"); LOG(log_debug, logtype_default, "3");
 
   LOG(log_debug, logtype_default, "-============");
   LOG(log_debug, logtype_default, "Flooding 5x");
   for (int i = 0; i < 5; i++) {
       LOG(log_debug, logtype_default, "Flooding...");
   }
-  LOG(log_debug, logtype_default, "1");
-  LOG(log_debug, logtype_default, "2");
-  LOG(log_debug, logtype_default, "3");
+  LOG(log_debug, logtype_default, "1"); LOG(log_debug, logtype_default, "2"); LOG(log_debug, logtype_default, "3");
+
+  LOG(log_debug, logtype_default, "o============");
+  LOG(log_debug, logtype_default, "Flooding 2005x");
+  for (int i = 0; i < 2005; i++) {
+      LOG(log_debug, logtype_default, "Flooding...");
+  }
+  LOG(log_debug, logtype_default, "1"); LOG(log_debug, logtype_default, "2"); LOG(log_debug, logtype_default, "3");
 
   LOG(log_debug, logtype_default, "0============");
   LOG(log_debug, logtype_default, "Flooding 11x1");