api: cleanup names

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

4 files changed, 10 insertions, 10 deletions

diff --git a/api/adapter.c b/api/adapter.c
index 2948a62..292b896 100644
--- a/api/adapter.c
+++ b/api/adapter.c
@@ -1890,7 +1890,7 @@ cleanupToken:
 }
 
 WINTUN_STATUS WINAPI
-WintunEnumAdapters(_In_z_ const WCHAR *Pool, _In_ WINTUN_ENUM_FUNC Func, _In_ LPARAM Param)
+WintunEnumAdapters(_In_z_ const WCHAR *Pool, _In_ WINTUN_ENUM_CALLBACK_FUNC Func, _In_ LPARAM Param)
 {
     HANDLE Mutex = NamespaceTakeMutex(Pool);
     if (!Mutex)
diff --git a/api/logger.c b/api/logger.c
index 6de25c8..303608a 100644
--- a/api/logger.c
+++ b/api/logger.c
@@ -14,10 +14,10 @@ NopLogger(_In_ WINTUN_LOGGER_LEVEL Level, _In_z_ const WCHAR *LogLine)
     return TRUE;
 }
 
-WINTUN_LOGGER_FUNC Logger = NopLogger;
+WINTUN_LOGGER_CALLBACK_FUNC Logger = NopLogger;
 
 void CALLBACK
-WintunSetLogger(_In_ WINTUN_LOGGER_FUNC NewLogger)
+WintunSetLogger(_In_ WINTUN_LOGGER_CALLBACK_FUNC NewLogger)
 {
     Logger = NewLogger;
 }
diff --git a/api/logger.h b/api/logger.h
index e126748..33a0e35 100644
--- a/api/logger.h
+++ b/api/logger.h
@@ -8,13 +8,13 @@
 #include "wintun.h"
 #include <Windows.h>
 
-extern WINTUN_LOGGER_FUNC Logger;
+extern WINTUN_LOGGER_CALLBACK_FUNC Logger;
 
 /**
  * @copydoc WINTUN_SET_LOGGER_FUNC
  */
 void WINAPI
-WintunSetLogger(_In_ WINTUN_LOGGER_FUNC NewLogger);
+WintunSetLogger(_In_ WINTUN_LOGGER_CALLBACK_FUNC NewLogger);
 
 _Post_equals_last_error_ DWORD
 LoggerError(_In_z_ const WCHAR *Prefix, _In_ DWORD Error);
diff --git a/api/wintun.h b/api/wintun.h
index cb9705e..fabe03d 100644
--- a/api/wintun.h
+++ b/api/wintun.h
@@ -79,7 +79,7 @@ typedef WINTUN_STATUS(WINAPI *WINTUN_DELETE_ADAPTER_FUNC)(
  *
  * @return Non-zero to continue iterating adapters; zero to stop.
  */
-typedef BOOL(CALLBACK *WINTUN_ENUM_FUNC)(_In_ WINTUN_ADAPTER_HANDLE Adapter, _In_ LPARAM Param);
+typedef BOOL(CALLBACK *WINTUN_ENUM_CALLBACK_FUNC)(_In_ WINTUN_ADAPTER_HANDLE Adapter, _In_ LPARAM Param);
 
 /**
  * Enumerates all Wintun adapters.
@@ -94,7 +94,7 @@ typedef BOOL(CALLBACK *WINTUN_ENUM_FUNC)(_In_ WINTUN_ADAPTER_HANDLE Adapter, _In
  * @return ERROR_SUCCESS on success; Win32 error code otherwise.
  */
 typedef WINTUN_STATUS(
-    WINAPI *WINTUN_ENUM_ADAPTERS_FUNC)(_In_z_ const WCHAR *Pool, _In_ WINTUN_ENUM_FUNC Func, _In_ LPARAM Param);
+    WINAPI *WINTUN_ENUM_ADAPTERS_FUNC)(_In_z_ const WCHAR *Pool, _In_ WINTUN_ENUM_CALLBACK_FUNC Callback, _In_ LPARAM Param);
 
 /**
  * Releases Wintun adapter resources.
@@ -210,7 +210,7 @@ typedef enum _WINTUN_LOGGER_LEVEL
  *
  * @return Anything - return value is ignored.
  */
-typedef BOOL(CALLBACK *WINTUN_LOGGER_FUNC)(_In_ WINTUN_LOGGER_LEVEL Level, _In_z_ const WCHAR *Message);
+typedef BOOL(CALLBACK *WINTUN_LOGGER_CALLBACK_FUNC)(_In_ WINTUN_LOGGER_LEVEL Level, _In_z_ const WCHAR *Message);
 
 /**
  * Sets logger callback function.
@@ -219,7 +219,7 @@ typedef BOOL(CALLBACK *WINTUN_LOGGER_FUNC)(_In_ WINTUN_LOGGER_LEVEL Level, _In_z
  *                      threads concurrently. Should the logging require serialization, you must handle serialization in
  *                      NewLogger.
  */
-typedef void(WINAPI *WINTUN_SET_LOGGER_FUNC)(_In_ WINTUN_LOGGER_FUNC NewLogger);
+typedef void(WINAPI *WINTUN_SET_LOGGER_FUNC)(_In_ WINTUN_LOGGER_CALLBACK_FUNC NewLogger);
 
 /**
  * Minimum ring capacity.
@@ -289,7 +289,7 @@ typedef void(WINAPI *WINTUN_END_SESSION_FUNC)(_In_ WINTUN_SESSION_HANDLE Session
  * ERROR_SUCCESS        on success.
  * Regardless, if the error was returned, some packets might have been read nevertheless.
  */
-typedef WINTUN_STATUS(WINAPI *WINTUN_RECEIVE_PACKETS_FUNC)(
+typedef WINTUN_STATUS(WINAPI *WINTUN_RECEIVE_PACKET_FUNC)(
     _In_ WINTUN_SESSION_HANDLE *Session,
     _Out_bytecapcount_(*PacketSize) BYTE **Packet,
     _Out_ DWORD *PacketSize);