[PATCH 07/17] update string typedefs in all include files

[Césaire Mounah <cesaire.mounah@xxxxxxxxxx>]

Update string typedef in include files to STR as STR is already
correctly annotated for string handling.

Signed-off-by: Césaire Mounah <cesaire.mounah@xxxxxxxxxx>
---
 include/cache_interface.h  |  4 ++--
 include/gnttab_interface.h |  4 ++--
 include/store_interface.h  | 28 ++++++++++++++--------------
 include/xencontrol.h       | 20 ++++++++++----------
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/include/cache_interface.h b/include/cache_interface.h
index 186af5b..e5f4ce9 100644
--- a/include/cache_interface.h
+++ b/include/cache_interface.h
@@ -127,7 +127,7 @@ typedef VOID
 typedef NTSTATUS
 (*XENBUS_CACHE_CREATE_V1)(
     _In_ PINTERFACE                 Interface,
-    _In_ const CHAR                 *Name,
+    _In_ PCSTR                      Name,
     _In_ ULONG                      Size,
     _In_ ULONG                      Reservation,
     _In_ XENBUS_CACHE_CTOR          Ctor,
@@ -159,7 +159,7 @@ typedef NTSTATUS
 typedef NTSTATUS
 (*XENBUS_CACHE_CREATE)(
     _In_ PINTERFACE                 Interface,
-    _In_ const CHAR                 *Name,
+    _In_ PCSTR                      Name,
     _In_ ULONG                      Size,
     _In_ ULONG                      Reservation,
     _In_ ULONG                      Cap,
diff --git a/include/gnttab_interface.h b/include/gnttab_interface.h
index c3c9874..7d930e1 100644
--- a/include/gnttab_interface.h
+++ b/include/gnttab_interface.h
@@ -76,7 +76,7 @@ typedef VOID
 typedef NTSTATUS
 (*XENBUS_GNTTAB_CREATE_CACHE_V1)(
     _In_ PINTERFACE                 Interface,
-    _In_ const CHAR                 *Name,
+    _In_ PCSTR                      Name,
     _In_ ULONG                      Reservation,
     _In_ XENBUS_CACHE_ACQUIRE_LOCK  AcquireLock,
     _In_ XENBUS_CACHE_RELEASE_LOCK  ReleaseLock,
@@ -99,7 +99,7 @@ typedef NTSTATUS
 typedef NTSTATUS
 (*XENBUS_GNTTAB_CREATE_CACHE)(
     _In_ PINTERFACE                 Interface,
-    _In_ const CHAR                 *Name,
+    _In_ PCSTR                      Name,
     _In_ ULONG                      Reservation,
     _In_ ULONG                      Cap,
     _In_ XENBUS_CACHE_ACQUIRE_LOCK  AcquireLock,
diff --git a/include/store_interface.h b/include/store_interface.h
index f633b02..2f01674 100644
--- a/include/store_interface.h
+++ b/include/store_interface.h
@@ -97,7 +97,7 @@ typedef VOID
 typedef VOID
 (*XENBUS_STORE_FREE)(
     _In_ PINTERFACE Interface,
-    _In_ PCHAR      Buffer
+    _In_ PSTR       Buffer
     );
 
 /*! \typedef XENBUS_STORE_READ
@@ -118,8 +118,8 @@ typedef NTSTATUS
 (*XENBUS_STORE_READ)(
     _In_ PINTERFACE                     Interface,
     _In_opt_ PXENBUS_STORE_TRANSACTION  Transaction,
-    _In_opt_ PCHAR                      Prefix,
-    _In_ PCHAR                          Node,
+    _In_opt_ PSTR                       Prefix,
+    _In_ PSTR                           Node,
     _Outptr_ PCHAR                      *Buffer
     );
 
@@ -141,9 +141,9 @@ typedef NTSTATUS
 (*XENBUS_STORE_PRINTF)(
     _In_ PINTERFACE                     Interface,
     _In_opt_ PXENBUS_STORE_TRANSACTION  Transaction,
-    _In_opt_ PCHAR                      Prefix,
-    _In_ PCHAR                          Node,
-    _In_ const CHAR                     *Format,
+    _In_opt_ PSTR                       Prefix,
+    _In_ PSTR                           Node,
+    _In_ PCSTR                          Format,
     ...
     );
 
@@ -161,8 +161,8 @@ typedef NTSTATUS
 (*XENBUS_STORE_REMOVE)(
     _In_ PINTERFACE                     Interface,
     _In_opt_ PXENBUS_STORE_TRANSACTION  Transaction,
-    _In_opt_ PCHAR                      Prefix,
-    _In_ PCHAR                          Node
+    _In_opt_ PSTR                       Prefix,
+    _In_ PSTR                           Node
     );
 
 /*! \typedef XENBUS_STORE_DIRECTORY
@@ -183,8 +183,8 @@ typedef NTSTATUS
 (*XENBUS_STORE_DIRECTORY)(
     _In_ PINTERFACE                     Interface,
     _In_opt_ PXENBUS_STORE_TRANSACTION  Transaction,
-    _In_opt_ PCHAR                      Prefix,
-    _In_ PCHAR                          Node,
+    _In_opt_ PSTR                       Prefix,
+    _In_ PSTR                           Node,
     _Outptr_ PCHAR                      *Buffer
     );
 
@@ -232,8 +232,8 @@ typedef NTSTATUS
 typedef NTSTATUS
 (*XENBUS_STORE_WATCH_ADD)(
     _In_ PINTERFACE                 Interface,
-    _In_opt_ PCHAR                  Prefix,
-    _In_ PCHAR                      Node,
+    _In_opt_ PSTR                   Prefix,
+    _In_ PSTR                       Node,
     _In_ PKEVENT                    Event,
     _Outptr_ PXENBUS_STORE_WATCH    *Watch
     );
@@ -281,8 +281,8 @@ typedef NTSTATUS
 (*XENBUS_STORE_PERMISSIONS_SET)(
     _In_ PINTERFACE                     Interface,
     _In_opt_ PXENBUS_STORE_TRANSACTION  Transaction,
-    _In_opt_ PCHAR                      Prefix,
-    _In_ PCHAR                          Node,
+    _In_opt_ PSTR                       Prefix,
+    _In_ PSTR                           Node,
     _In_ PXENBUS_STORE_PERMISSION       Permissions,
     _In_ ULONG                          NumberPermissions
     );
diff --git a/include/xencontrol.h b/include/xencontrol.h
index efd790f..f9f0570 100644
--- a/include/xencontrol.h
+++ b/include/xencontrol.h
@@ -39,8 +39,8 @@ _XENCONTROL_LOG_LEVEL {
 typedef void
 XENCONTROL_LOGGER(
     _In_ XENCONTROL_LOG_LEVEL   LogLevel,
-    _In_ const CHAR             *Function,
-    _In_ const WCHAR            *Message,
+    _In_ PCSTR                  Function,
+    _In_ PCWSTR                 Message,
     _In_ va_list                Args
     );
 
@@ -272,7 +272,7 @@ XcStoreRead(
     _In_ PXENCONTROL_CONTEXT    Xc,
     _In_ PSTR                   Path,
     _In_ DWORD                  cbValue,
-    _Out_ CHAR                  *Value
+    _Out_ PSTR                  Value
     );
 
 /*! \brief Write a value to a XenStore key
@@ -285,8 +285,8 @@ XENCONTROL_API
 DWORD
 XcStoreWrite(
     _In_ PXENCONTROL_CONTEXT    Xc,
-    _In_ PCHAR                  Path,
-    _In_ PCHAR                  Value
+    _In_ PSTR                   Path,
+    _In_ PSTR                   Value
     );
 
 /*! \brief Enumerate all immediate child keys of a XenStore key
@@ -300,9 +300,9 @@ XENCONTROL_API
 DWORD
 XcStoreDirectory(
     _In_ PXENCONTROL_CONTEXT    Xc,
-    _In_ PCHAR                  Path,
+    _In_ PSTR                   Path,
     _In_ DWORD                  cbOutput,
-    _Out_ CHAR                  *Output
+    _Out_ PSTR                  Output
     );
 
 /*! \brief Remove a XenStore key
@@ -314,7 +314,7 @@ XENCONTROL_API
 DWORD
 XcStoreRemove(
     _In_ PXENCONTROL_CONTEXT    Xc,
-    _In_ PCHAR                  Path
+    _In_ PSTR                   Path
     );
 
 /*! \brief Set permissions of a XenStore key
@@ -328,7 +328,7 @@ XENCONTROL_API
 DWORD
 XcStoreSetPermissions(
     _In_ PXENCONTROL_CONTEXT        Xc,
-    _In_ PCHAR                      Path,
+    _In_ PSTR                       Path,
     _In_ ULONG                      Count,
     _In_ PXENIFACE_STORE_PERMISSION Permissions
     );
@@ -344,7 +344,7 @@ XENCONTROL_API
 DWORD
 XcStoreAddWatch(
     _In_ PXENCONTROL_CONTEXT    Xc,
-    _In_ PCHAR                  Path,
+    _In_ PSTR                   Path,
     _In_ HANDLE                 Event,
     _Outptr_ PVOID              *Handle
     );
-- 
2.55.0.windows.5



--
Césaire Mounah | Vates Windows Guest Tools Engineer

XCP-ng & Xen Orchestra - Vates solutions

web: https://vates.tech