Revert previous commit

[reactos.git] / reactos / include / ddk / ntstrsafe.h

diff --git a/reactos/include/ddk/ntstrsafe.h b/reactos/include/ddk/ntstrsafe.h
index e7a2653..c107a0d 100644 (file)
--- a/reactos/include/ddk/ntstrsafe.h
+++ b/reactos/include/ddk/ntstrsafe.h
@@ -1,6 +1,6 @@
 /*
  * PROJECT:         ReactOS Kernel
- * LICENSE:         GPL - See COPYING in the top level directory
+ * LICENSE:         This file is in the public domain.
  * FILE:            include/ddk/ntstrsafe.h
  * PURPOSE:         Safe String Library for NT Code (Native/Kernel)
  * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
@@ -33,10 +33,10 @@ typedef unsigned long DWORD;
 
 /* PRIVATE FUNCTIONS *********************************************************/
 
-__inline
+static __inline
 NTSTATUS
 NTAPI
-RtlStringLengthWorkerA(IN PCHAR String,
+RtlStringLengthWorkerA(IN LPCSTR String,
                        IN SIZE_T MaxLength,
                        OUT PSIZE_T ReturnLength OPTIONAL)
 {
@@ -66,10 +66,10 @@ RtlStringLengthWorkerA(IN PCHAR String,
     return Status;
 }
 
-__inline
+static __inline
 NTSTATUS
 NTAPI
-RtlStringValidateDestA(IN PCHAR Destination,
+RtlStringValidateDestA(IN LPSTR Destination,
                        IN SIZE_T Length,
                        OUT PSIZE_T ReturnLength OPTIONAL,
                        IN SIZE_T MaxLength)
@@ -95,10 +95,10 @@ RtlStringValidateDestA(IN PCHAR Destination,
     return Status;
 }
 
-__inline
+static __inline
 NTSTATUS
 NTAPI
-RtlStringExValidateDestA(IN OUT PCHAR *Destination,
+RtlStringExValidateDestA(IN OUT LPSTR *Destination,
                          IN OUT PSIZE_T DestinationLength,
                          OUT PSIZE_T ReturnLength OPTIONAL,
                          IN SIZE_T MaxLength,
@@ -111,10 +111,10 @@ RtlStringExValidateDestA(IN OUT PCHAR *Destination,
                                   MaxLength);
 }
 
-__inline
+static __inline
 NTSTATUS
 NTAPI
-RtlStringExValidateSrcA(IN OUT PCCHAR *Source OPTIONAL,
+RtlStringExValidateSrcA(IN OUT LPCSTR *Source OPTIONAL,
                         IN OUT PSIZE_T ReturnLength OPTIONAL,
                         IN SIZE_T MaxLength,
                         IN DWORD Flags)
@@ -130,13 +130,13 @@ RtlStringExValidateSrcA(IN OUT PCCHAR *Source OPTIONAL,
     return Status;
 }
 
-__inline
+static __inline
 NTSTATUS
 NTAPI
-RtlStringVPrintfWorkerA(OUT PCHAR Destination,
+RtlStringVPrintfWorkerA(OUT LPSTR Destination,
                         IN SIZE_T Length,
                         OUT PSIZE_T NewLength OPTIONAL,
-                        IN PCCHAR Format,
+                        IN LPCSTR Format,
                         IN va_list argList)
 {
     NTSTATUS Status = STATUS_SUCCESS;
@@ -171,13 +171,13 @@ RtlStringVPrintfWorkerA(OUT PCHAR Destination,
     return Status;
 }
 
-__inline
+static __inline
 NTSTATUS
 NTAPI
-RtlStringCopyWorkerA(OUT PCHAR Destination,
+RtlStringCopyWorkerA(OUT LPSTR Destination,
                      IN SIZE_T Length,
                      OUT PSIZE_T NewLength OPTIONAL,
-                     IN PCCHAR Source,
+                     IN LPCSTR Source,
                      IN SIZE_T CopyLength)
 {
     NTSTATUS Status = STATUS_SUCCESS;
@@ -208,23 +208,22 @@ RtlStringCopyWorkerA(OUT PCHAR Destination,
 
 /* PUBLIC FUNCTIONS **********************************************************/
 
-__inline
+static __inline
 NTSTATUS
 NTAPI
-RtlStringCchCopyA(IN PCHAR Destination,
+RtlStringCchCopyA(IN LPSTR Destination,
                   IN SIZE_T cchDest,
-                  IN PCCHAR pszSrc)
+                  IN LPCSTR pszSrc)
 {
     ASSERTMSG("RtlStringCchCopyA is UNIMPLEMENTED!\n", FALSE);
     return STATUS_NOT_IMPLEMENTED;
 }
 
-__inline
+static __inline
 NTSTATUS
-NTAPI
-RtlStringCbPrintfA(OUT PCHAR Destination,
+RtlStringCbPrintfA(OUT LPSTR Destination,
                    IN SIZE_T Length,
-                   IN PCHAR Format,
+                   IN LPCSTR Format,
                    ...)
 {
     NTSTATUS Status;
@@ -249,15 +248,14 @@ RtlStringCbPrintfA(OUT PCHAR Destination,
     return Status;
 }
 
-__inline
+static __inline
 NTSTATUS
-NTAPI
-RtlStringCbPrintfExA(OUT PCHAR Destination,
+RtlStringCbPrintfExA(OUT LPSTR Destination,
                      IN SIZE_T Length,
-                     OUT PCHAR *DestinationEnd OPTIONAL,
+                     OUT LPSTR *DestinationEnd OPTIONAL,
                      OUT PSIZE_T RemainingSize OPTIONAL,
                      IN DWORD Flags,
-                     IN PCCHAR Format,
+                     IN LPCSTR Format,
                      ...)
 {
     NTSTATUS Status;
@@ -330,13 +328,13 @@ RtlStringCbPrintfExA(OUT PCHAR Destination,
     return Status;
 }
 
-__inline
+static __inline
 NTSTATUS
 NTAPI
-RtlStringCbCopyExA(OUT PCHAR Destination,
+RtlStringCbCopyExA(OUT LPSTR Destination,
                    IN SIZE_T Length,
-                   IN PCCHAR Source,
-                   OUT PCHAR *DestinationEnd OPTIONAL,
+                   IN LPCSTR Source,
+                   OUT LPSTR *DestinationEnd OPTIONAL,
                    OUT PSIZE_T RemainingSize OPTIONAL,
                    IN DWORD Flags)
 {
@@ -407,9 +405,8 @@ RtlStringCbCopyExA(OUT PCHAR Destination,
     return Status;
 }
 
-__inline
+static __inline
 NTSTATUS
-NTAPI
 RtlStringCbPrintfW(
     LPWSTR pszDest,
     IN size_t cbDest,
@@ -420,13 +417,13 @@ RtlStringCbPrintfW(
     return STATUS_NOT_IMPLEMENTED;
 }
 
-__inline
+static __inline
 NTSTATUS
 NTAPI
-RtlStringCbCatExA(IN OUT PCHAR Destination,
+RtlStringCbCatExA(IN OUT LPSTR Destination,
                   IN SIZE_T Length,
-                  IN PCCHAR Source,
-                  OUT PCHAR *DestinationEnd OPTIONAL,
+                  IN LPCSTR Source,
+                  OUT LPSTR *DestinationEnd OPTIONAL,
                   OUT PSIZE_T RemainingSize OPTIONAL,
                   IN DWORD Flags)
 {
@@ -494,12 +491,12 @@ RtlStringCbCatExA(IN OUT PCHAR Destination,
     return Status;
 }
 
-__inline
+static __inline
 NTSTATUS
 NTAPI
-RtlStringCbCopyA(OUT PCHAR Destination,
+RtlStringCbCopyA(OUT LPSTR Destination,
                  IN SIZE_T Length,
-                 IN PCCHAR Source)
+                 IN LPCSTR Source)
 {
     NTSTATUS Status;
     SIZE_T CharLength = Length / sizeof(CHAR);
@@ -520,4 +517,4 @@ RtlStringCbCopyA(OUT PCHAR Destination,
     return Status;
 }
 
-#endif
+#endif /* _NTSTRSAFE_H_INCLUDED_ */