Restoring authorship annotation for <kikht@yandex-team.ru>. Commit 1 of 2.

1 files changed, 64 insertions, 64 deletions

diff --git a/contrib/libs/libevent/minheap-internal.h b/contrib/libs/libevent/minheap-internal.h
index b3a0eb1fb5..ee5138ea0e 100644
--- a/contrib/libs/libevent/minheap-internal.h
+++ b/contrib/libs/libevent/minheap-internal.h
@@ -25,11 +25,11 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef MINHEAP_INTERNAL_H_INCLUDED_
-#define MINHEAP_INTERNAL_H_INCLUDED_
+#ifndef MINHEAP_INTERNAL_H_INCLUDED_ 
+#define MINHEAP_INTERNAL_H_INCLUDED_ 
 
 #include "event2/event-config.h"
-#include "evconfig-private.h"
+#include "evconfig-private.h" 
 #include "event2/event.h"
 #include "event2/event_struct.h"
 #include "event2/util.h"
@@ -42,41 +42,41 @@ typedef struct min_heap
 	unsigned n, a;
 } min_heap_t;
 
-static inline void	     min_heap_ctor_(min_heap_t* s);
-static inline void	     min_heap_dtor_(min_heap_t* s);
-static inline void	     min_heap_elem_init_(struct event* e);
-static inline int	     min_heap_elt_is_top_(const struct event *e);
-static inline int	     min_heap_empty_(min_heap_t* s);
-static inline unsigned	     min_heap_size_(min_heap_t* s);
-static inline struct event*  min_heap_top_(min_heap_t* s);
-static inline int	     min_heap_reserve_(min_heap_t* s, unsigned n);
-static inline int	     min_heap_push_(min_heap_t* s, struct event* e);
-static inline struct event*  min_heap_pop_(min_heap_t* s);
-static inline int	     min_heap_adjust_(min_heap_t *s, struct event* e);
-static inline int	     min_heap_erase_(min_heap_t* s, struct event* e);
+static inline void	     min_heap_ctor_(min_heap_t* s); 
+static inline void	     min_heap_dtor_(min_heap_t* s); 
+static inline void	     min_heap_elem_init_(struct event* e); 
+static inline int	     min_heap_elt_is_top_(const struct event *e); 
+static inline int	     min_heap_empty_(min_heap_t* s); 
+static inline unsigned	     min_heap_size_(min_heap_t* s); 
+static inline struct event*  min_heap_top_(min_heap_t* s); 
+static inline int	     min_heap_reserve_(min_heap_t* s, unsigned n); 
+static inline int	     min_heap_push_(min_heap_t* s, struct event* e); 
+static inline struct event*  min_heap_pop_(min_heap_t* s); 
+static inline int	     min_heap_adjust_(min_heap_t *s, struct event* e); 
+static inline int	     min_heap_erase_(min_heap_t* s, struct event* e); 
 static inline void	     min_heap_shift_up_(min_heap_t* s, unsigned hole_index, struct event* e);
-static inline void	     min_heap_shift_up_unconditional_(min_heap_t* s, unsigned hole_index, struct event* e);
+static inline void	     min_heap_shift_up_unconditional_(min_heap_t* s, unsigned hole_index, struct event* e); 
 static inline void	     min_heap_shift_down_(min_heap_t* s, unsigned hole_index, struct event* e);
 
-#define min_heap_elem_greater(a, b) \
-	(evutil_timercmp(&(a)->ev_timeout, &(b)->ev_timeout, >))
+#define min_heap_elem_greater(a, b) \ 
+	(evutil_timercmp(&(a)->ev_timeout, &(b)->ev_timeout, >)) 
 
-void min_heap_ctor_(min_heap_t* s) { s->p = 0; s->n = 0; s->a = 0; }
-void min_heap_dtor_(min_heap_t* s) { if (s->p) mm_free(s->p); }
-void min_heap_elem_init_(struct event* e) { e->ev_timeout_pos.min_heap_idx = -1; }
-int min_heap_empty_(min_heap_t* s) { return 0u == s->n; }
-unsigned min_heap_size_(min_heap_t* s) { return s->n; }
-struct event* min_heap_top_(min_heap_t* s) { return s->n ? *s->p : 0; }
+void min_heap_ctor_(min_heap_t* s) { s->p = 0; s->n = 0; s->a = 0; } 
+void min_heap_dtor_(min_heap_t* s) { if (s->p) mm_free(s->p); } 
+void min_heap_elem_init_(struct event* e) { e->ev_timeout_pos.min_heap_idx = -1; } 
+int min_heap_empty_(min_heap_t* s) { return 0u == s->n; } 
+unsigned min_heap_size_(min_heap_t* s) { return s->n; } 
+struct event* min_heap_top_(min_heap_t* s) { return s->n ? *s->p : 0; } 
 
-int min_heap_push_(min_heap_t* s, struct event* e)
+int min_heap_push_(min_heap_t* s, struct event* e) 
 {
-	if (s->n == UINT32_MAX || min_heap_reserve_(s, s->n + 1))
+	if (s->n == UINT32_MAX || min_heap_reserve_(s, s->n + 1)) 
 		return -1;
 	min_heap_shift_up_(s, s->n++, e);
 	return 0;
 }
 
-struct event* min_heap_pop_(min_heap_t* s)
+struct event* min_heap_pop_(min_heap_t* s) 
 {
 	if (s->n)
 	{
@@ -88,12 +88,12 @@ struct event* min_heap_pop_(min_heap_t* s)
 	return 0;
 }
 
-int min_heap_elt_is_top_(const struct event *e)
+int min_heap_elt_is_top_(const struct event *e) 
 {
 	return e->ev_timeout_pos.min_heap_idx == 0;
 }
 
-int min_heap_erase_(min_heap_t* s, struct event* e)
+int min_heap_erase_(min_heap_t* s, struct event* e) 
 {
 	if (-1 != e->ev_timeout_pos.min_heap_idx)
 	{
@@ -105,7 +105,7 @@ int min_heap_erase_(min_heap_t* s, struct event* e)
 		   to be less than the parent, it can't need to shift both up and
 		   down. */
 		if (e->ev_timeout_pos.min_heap_idx > 0 && min_heap_elem_greater(s->p[parent], last))
-			min_heap_shift_up_unconditional_(s, e->ev_timeout_pos.min_heap_idx, last);
+			min_heap_shift_up_unconditional_(s, e->ev_timeout_pos.min_heap_idx, last); 
 		else
 			min_heap_shift_down_(s, e->ev_timeout_pos.min_heap_idx, last);
 		e->ev_timeout_pos.min_heap_idx = -1;
@@ -114,34 +114,34 @@ int min_heap_erase_(min_heap_t* s, struct event* e)
 	return -1;
 }
 
-int min_heap_adjust_(min_heap_t *s, struct event *e)
-{
-	if (-1 == e->ev_timeout_pos.min_heap_idx) {
-		return min_heap_push_(s, e);
-	} else {
-		unsigned parent = (e->ev_timeout_pos.min_heap_idx - 1) / 2;
-		/* The position of e has changed; we shift it up or down
-		 * as needed.  We can't need to do both. */
-		if (e->ev_timeout_pos.min_heap_idx > 0 && min_heap_elem_greater(s->p[parent], e))
-			min_heap_shift_up_unconditional_(s, e->ev_timeout_pos.min_heap_idx, e);
-		else
-			min_heap_shift_down_(s, e->ev_timeout_pos.min_heap_idx, e);
-		return 0;
-	}
-}
-
-int min_heap_reserve_(min_heap_t* s, unsigned n)
+int min_heap_adjust_(min_heap_t *s, struct event *e) 
 {
+	if (-1 == e->ev_timeout_pos.min_heap_idx) { 
+		return min_heap_push_(s, e); 
+	} else { 
+		unsigned parent = (e->ev_timeout_pos.min_heap_idx - 1) / 2; 
+		/* The position of e has changed; we shift it up or down 
+		 * as needed.  We can't need to do both. */ 
+		if (e->ev_timeout_pos.min_heap_idx > 0 && min_heap_elem_greater(s->p[parent], e)) 
+			min_heap_shift_up_unconditional_(s, e->ev_timeout_pos.min_heap_idx, e); 
+		else 
+			min_heap_shift_down_(s, e->ev_timeout_pos.min_heap_idx, e); 
+		return 0; 
+	} 
+} 
+ 
+int min_heap_reserve_(min_heap_t* s, unsigned n) 
+{ 
 	if (s->a < n)
 	{
 		struct event** p;
 		unsigned a = s->a ? s->a * 2 : 8;
 		if (a < n)
 			a = n;
-#if (SIZE_MAX == UINT32_MAX)
-		if (a > SIZE_MAX / sizeof *p)
-			return -1;
-#endif
+#if (SIZE_MAX == UINT32_MAX) 
+		if (a > SIZE_MAX / sizeof *p) 
+			return -1; 
+#endif 
 		if (!(p = (struct event**)mm_realloc(s->p, a * sizeof *p)))
 			return -1;
 		s->p = p;
@@ -150,18 +150,18 @@ int min_heap_reserve_(min_heap_t* s, unsigned n)
 	return 0;
 }
 
-void min_heap_shift_up_unconditional_(min_heap_t* s, unsigned hole_index, struct event* e)
-{
-    unsigned parent = (hole_index - 1) / 2;
-    do
-    {
-	(s->p[hole_index] = s->p[parent])->ev_timeout_pos.min_heap_idx = hole_index;
-	hole_index = parent;
-	parent = (hole_index - 1) / 2;
-    } while (hole_index && min_heap_elem_greater(s->p[parent], e));
-    (s->p[hole_index] = e)->ev_timeout_pos.min_heap_idx = hole_index;
-}
-
+void min_heap_shift_up_unconditional_(min_heap_t* s, unsigned hole_index, struct event* e) 
+{ 
+    unsigned parent = (hole_index - 1) / 2; 
+    do 
+    { 
+	(s->p[hole_index] = s->p[parent])->ev_timeout_pos.min_heap_idx = hole_index; 
+	hole_index = parent; 
+	parent = (hole_index - 1) / 2; 
+    } while (hole_index && min_heap_elem_greater(s->p[parent], e)); 
+    (s->p[hole_index] = e)->ev_timeout_pos.min_heap_idx = hole_index; 
+} 
+ 
 void min_heap_shift_up_(min_heap_t* s, unsigned hole_index, struct event* e)
 {
     unsigned parent = (hole_index - 1) / 2;
@@ -189,4 +189,4 @@ void min_heap_shift_down_(min_heap_t* s, unsigned hole_index, struct event* e)
     (s->p[hole_index] = e)->ev_timeout_pos.min_heap_idx = hole_index;
 }
 
-#endif /* MINHEAP_INTERNAL_H_INCLUDED_ */
+#endif /* MINHEAP_INTERNAL_H_INCLUDED_ */