From 292467c02e9a9c679d5760c171c74aaa090e0308 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 22 Dec 2009 00:58:52 -0500
Subject: [PATCH] Use evutil_socket_t, not int, when logging socket errors.

---
 log-internal.h | 6 ++++--
 log.c          | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/log-internal.h b/log-internal.h
index 51e65516..d41f2965 100644
--- a/log-internal.h
+++ b/log-internal.h
@@ -27,6 +27,8 @@
 #ifndef _LOG_H_
 #define _LOG_H_
 
+#include <event2/util.h>
+
 #ifdef __GNUC__
 #define EV_CHECK_FMT(a,b) __attribute__((format(printf, a, b)))
 #else
@@ -37,8 +39,8 @@
 
 void event_err(int eval, const char *fmt, ...) EV_CHECK_FMT(2,3);
 void event_warn(const char *fmt, ...) EV_CHECK_FMT(1,2);
-void event_sock_err(int eval, int sock, const char *fmt, ...) EV_CHECK_FMT(3,4);
-void event_sock_warn(int sock, const char *fmt, ...) EV_CHECK_FMT(2,3);
+void event_sock_err(int eval, evutil_socket_t sock, const char *fmt, ...) EV_CHECK_FMT(3,4);
+void event_sock_warn(evutil_socket_t sock, const char *fmt, ...) EV_CHECK_FMT(2,3);
 void event_errx(int eval, const char *fmt, ...) EV_CHECK_FMT(2,3);
 void event_warnx(const char *fmt, ...) EV_CHECK_FMT(1,2);
 void event_msgx(const char *fmt, ...) EV_CHECK_FMT(1,2);
diff --git a/log.c b/log.c
index 9c97ace8..865e6b95 100644
--- a/log.c
+++ b/log.c
@@ -113,7 +113,7 @@ event_sock_err(int eval, evutil_socket_t sock, const char *fmt, ...)
 }
 
 void
-event_sock_warn(int sock, const char *fmt, ...)
+event_sock_warn(evutil_socket_t sock, const char *fmt, ...)
 {
 	va_list ap;
 	int err = evutil_socket_geterror(sock);