aboutsummaryrefslogtreecommitdiffstats
path: root/api/adapter.c
diff options
context:
space:
mode:
authorSimon Rozman <simon@rozman.si>2021-02-02 12:53:40 +0100
committerSimon Rozman <simon@rozman.si>2021-02-04 19:00:17 +0100
commit542a281808a7ae6eddab0b2e977d519ef37e162f (patch)
treec2d20e1fca502b211d4c78eb7a3526cc2f964d32 /api/adapter.c
parentapi: truncate long log lines with … (diff)
downloadwintun-542a281808a7ae6eddab0b2e977d519ef37e162f.tar.xz
wintun-542a281808a7ae6eddab0b2e977d519ef37e162f.zip
api: tighten function parameter code analysis annotations
Signed-off-by: Simon Rozman <simon@rozman.si>
Diffstat (limited to 'api/adapter.c')
-rw-r--r--api/adapter.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/api/adapter.c b/api/adapter.c
index 1ca8c2c..1e43286 100644
--- a/api/adapter.c
+++ b/api/adapter.c
@@ -178,7 +178,7 @@ IsOurAdapter(_In_ HDEVINFO DevInfo, _In_ SP_DEVINFO_DATA *DevInfoData)
return IsOurs;
}
-static _Return_type_success_(return != NULL) WCHAR *GetDeviceObjectFileName(_In_opt_z_ const WCHAR *InstanceId)
+static _Return_type_success_(return != NULL) WCHAR *GetDeviceObjectFileName(_In_z_ const WCHAR *InstanceId)
{
ULONG InterfacesLen;
DWORD LastError = CM_MapCrToWin32Err(
@@ -214,7 +214,7 @@ static _Return_type_success_(return != NULL) WCHAR *GetDeviceObjectFileName(_In_
return Interfaces;
}
-static _Return_type_success_(return != INVALID_HANDLE_VALUE) HANDLE OpenDeviceObject(_In_opt_z_ const WCHAR *InstanceId)
+static _Return_type_success_(return != INVALID_HANDLE_VALUE) HANDLE OpenDeviceObject(_In_z_ const WCHAR *InstanceId)
{
WCHAR *Filename = GetDeviceObjectFileName(InstanceId);
if (!Filename)
@@ -234,7 +234,7 @@ static _Return_type_success_(return != INVALID_HANDLE_VALUE) HANDLE OpenDeviceOb
}
static BOOL
-EnsureDeviceObject(_In_opt_z_ const WCHAR *InstanceId)
+EnsureDeviceObject(_In_z_ const WCHAR *InstanceId)
{
WCHAR *Filename = GetDeviceObjectFileName(InstanceId);
if (!Filename)
@@ -426,8 +426,7 @@ static _Return_type_success_(return != FALSE) BOOL
return TRUE;
}
-static _Return_type_success_(return != FALSE) BOOL
- GetNetCfgInstanceIdFromHKEY(_In_ HKEY Key, _Out_ GUID *CfgInstanceID)
+static _Return_type_success_(return != FALSE) BOOL GetNetCfgInstanceIdFromHKEY(_In_ HKEY Key, _Out_ GUID *CfgInstanceID)
{
WCHAR *ValueStr = RegistryQueryString(Key, L"NetCfgInstanceId", TRUE);
if (!ValueStr)
@@ -1184,7 +1183,7 @@ EnsureWintunUnloaded(void)
static _Return_type_success_(return != FALSE) BOOL SelectDriver(
_In_ HDEVINFO DevInfo,
- _In_opt_ SP_DEVINFO_DATA *DevInfoData,
+ _In_ SP_DEVINFO_DATA *DevInfoData,
_Inout_ SP_DEVINSTALL_PARAMS_W *DevInstallParams)
{
static const FILETIME OurDriverDate = WINTUN_INF_FILETIME;