From b0cd7ba3dcf94021ff37129ef344fc32ad42024e Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Wed, 28 Sep 2016 18:17:03 -0700
Subject: [PATCH] Clean up libpsl-native headers

---
 src/libpsl-native/src/createhardlink.cpp        | 3 ++-
 src/libpsl-native/src/createsymlink.cpp         | 3 ++-
 src/libpsl-native/src/createsymlink.h           | 1 +
 src/libpsl-native/src/followsymlink.cpp         | 5 +++--
 src/libpsl-native/src/getcomputername.cpp       | 3 ++-
 src/libpsl-native/src/getcurrentprocessorid.cpp | 7 +++----
 src/libpsl-native/src/getcurrentprocessorid.h   | 3 ++-
 src/libpsl-native/src/getcurrentthreadid.cpp    | 6 +++---
 src/libpsl-native/src/getcurrentthreadid.h      | 4 +++-
 src/libpsl-native/src/getfileowner.cpp          | 7 ++++---
 src/libpsl-native/src/getfullyqualifiedname.cpp | 5 +++--
 src/libpsl-native/src/getlinkcount.cpp          | 3 ++-
 src/libpsl-native/src/getlstat.cpp              | 3 ++-
 src/libpsl-native/src/getlstat.h                | 3 ++-
 src/libpsl-native/src/getpwuid.cpp              | 3 ++-
 src/libpsl-native/src/getpwuid.h                | 3 ++-
 src/libpsl-native/src/getstat.cpp               | 3 ++-
 src/libpsl-native/src/getstat.h                 | 3 ++-
 src/libpsl-native/src/getuserfrompid.cpp        | 9 +++++----
 src/libpsl-native/src/getuserfrompid.h          | 2 ++
 src/libpsl-native/src/getusername.cpp           | 3 ++-
 src/libpsl-native/src/isdirectory.cpp           | 9 +++++----
 src/libpsl-native/src/isdirectory.h             | 1 +
 src/libpsl-native/src/isexecutable.cpp          | 3 ++-
 src/libpsl-native/src/isexecutable.h            | 1 +
 src/libpsl-native/src/isfile.cpp                | 5 +++--
 src/libpsl-native/src/isfile.h                  | 1 +
 src/libpsl-native/src/issymlink.cpp             | 5 +++--
 src/libpsl-native/src/issymlink.h               | 1 +
 src/libpsl-native/src/setdate.cpp               | 3 ++-
 30 files changed, 70 insertions(+), 41 deletions(-)

diff --git a/src/libpsl-native/src/createhardlink.cpp b/src/libpsl-native/src/createhardlink.cpp
index 29727c2cf..8cbc1d666 100644
--- a/src/libpsl-native/src/createhardlink.cpp
+++ b/src/libpsl-native/src/createhardlink.cpp
@@ -2,10 +2,11 @@
 //! @author George FLeming <v-geflem@microsoft.com>
 //! @brief create new hard link
 
+#include "createhardlink.h"
+
 #include <errno.h>
 #include <unistd.h>
 #include <string>
-#include "createhardlink.h"
 
 //! @brief Createhardlink create new symbolic link
 //!
diff --git a/src/libpsl-native/src/createsymlink.cpp b/src/libpsl-native/src/createsymlink.cpp
index b9ce2b18d..6cd712781 100644
--- a/src/libpsl-native/src/createsymlink.cpp
+++ b/src/libpsl-native/src/createsymlink.cpp
@@ -2,10 +2,11 @@
 //! @author George FLeming <v-geflem@microsoft.com>
 //! @brief create new symbolic link
 
+#include "createsymlink.h"
+
 #include <errno.h>
 #include <unistd.h>
 #include <string>
-#include "createsymlink.h"
 
 //! @brief Createsymlink create new symbolic link
 //!
diff --git a/src/libpsl-native/src/createsymlink.h b/src/libpsl-native/src/createsymlink.h
index 45da92890..e2f4bd3d1 100644
--- a/src/libpsl-native/src/createsymlink.h
+++ b/src/libpsl-native/src/createsymlink.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "pal.h"
+
 #include <stdbool.h>
 
 PAL_BEGIN_EXTERNC
diff --git a/src/libpsl-native/src/followsymlink.cpp b/src/libpsl-native/src/followsymlink.cpp
index 47d088395..78b6831be 100644
--- a/src/libpsl-native/src/followsymlink.cpp
+++ b/src/libpsl-native/src/followsymlink.cpp
@@ -2,12 +2,13 @@
 //! @author George FLeming <v-geflem@microsoft.com>
 //! @brief returns whether a path is a symbolic link
 
+#include "followsymlink.h"
+#include "issymlink.h"
+
 #include <errno.h>
 #include <unistd.h>
 #include <string>
 #include <iostream>
-#include "followsymlink.h"
-#include "issymlink.h"
 
 //! @brief Followsymlink determines target path of a sym link
 //!
diff --git a/src/libpsl-native/src/getcomputername.cpp b/src/libpsl-native/src/getcomputername.cpp
index 3e480b9ad..1c257e1fa 100644
--- a/src/libpsl-native/src/getcomputername.cpp
+++ b/src/libpsl-native/src/getcomputername.cpp
@@ -2,10 +2,11 @@
 //! @author George Fleming <v-geflem@microsoft>
 //! @brief Implements GetComputerName Win32 API
 
+#include "getcomputername.h"
+
 #include <errno.h>
 #include <unistd.h>
 #include <string>
-#include "getcomputername.h"
 
 //! @brief GetComputerName retrieves the name of the host associated with
 //! the current thread.
diff --git a/src/libpsl-native/src/getcurrentprocessorid.cpp b/src/libpsl-native/src/getcurrentprocessorid.cpp
index eea80937b..6ef7ddb68 100644
--- a/src/libpsl-native/src/getcurrentprocessorid.cpp
+++ b/src/libpsl-native/src/getcurrentprocessorid.cpp
@@ -1,9 +1,8 @@
 #include "getcurrentprocessorid.h"
+
 #include <unistd.h>
 
-int32_t GetCurrentProcessId()
+pid_t GetCurrentProcessId()
 {
-    pid_t pid = getpid();
-    return static_cast<int32_t>(pid);
+    return getpid();
 }
-
diff --git a/src/libpsl-native/src/getcurrentprocessorid.h b/src/libpsl-native/src/getcurrentprocessorid.h
index 3c768e72e..ece2f5c35 100644
--- a/src/libpsl-native/src/getcurrentprocessorid.h
+++ b/src/libpsl-native/src/getcurrentprocessorid.h
@@ -1,10 +1,11 @@
 #pragma once
 
 #include "pal.h"
+#include <sys/types.h>
 
 PAL_BEGIN_EXTERNC
 
-int32_t GetCurrentProcessId();
+pid_t GetCurrentProcessId();
 
 PAL_END_EXTERNC
 
diff --git a/src/libpsl-native/src/getcurrentthreadid.cpp b/src/libpsl-native/src/getcurrentthreadid.cpp
index efd7a3136..7422d57af 100644
--- a/src/libpsl-native/src/getcurrentthreadid.cpp
+++ b/src/libpsl-native/src/getcurrentthreadid.cpp
@@ -1,9 +1,9 @@
 #include "getcurrentthreadid.h"
+
 #include <unistd.h>
 #include <pthread.h>
 
-HANDLE GetCurrentThreadId()
+pid_t GetCurrentThreadId()
 {
-	pid_t tid = pthread_self();
-	return reinterpret_cast<HANDLE>(tid);
+		return pthread_self();
 }
diff --git a/src/libpsl-native/src/getcurrentthreadid.h b/src/libpsl-native/src/getcurrentthreadid.h
index 258c3c397..cc388ec41 100644
--- a/src/libpsl-native/src/getcurrentthreadid.h
+++ b/src/libpsl-native/src/getcurrentthreadid.h
@@ -2,9 +2,11 @@
 
 #include "pal.h"
 
+#include <sys/types.h>
+
 PAL_BEGIN_EXTERNC
 
-HANDLE GetCurrentThreadId();
+pid_t GetCurrentThreadId();
 
 PAL_END_EXTERNC
 
diff --git a/src/libpsl-native/src/getfileowner.cpp b/src/libpsl-native/src/getfileowner.cpp
index c1bd5b69f..de3deaee7 100644
--- a/src/libpsl-native/src/getfileowner.cpp
+++ b/src/libpsl-native/src/getfileowner.cpp
@@ -2,15 +2,16 @@
 //! @author Andrew Schwartzmeyer <andschwa@microsoft.com>
 //! @brief returns the owner of a file
 
+#include "getstat.h"
+#include "getpwuid.h"
+#include "getfileowner.h"
+
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <pwd.h>
 #include <string.h>
 #include <unistd.h>
-#include "getstat.h"
-#include "getpwuid.h"
-#include "getfileowner.h"
 
 //! @brief GetFileOwner returns the owner of a file
 //!
diff --git a/src/libpsl-native/src/getfullyqualifiedname.cpp b/src/libpsl-native/src/getfullyqualifiedname.cpp
index e88ab988e..75e5af4b3 100644
--- a/src/libpsl-native/src/getfullyqualifiedname.cpp
+++ b/src/libpsl-native/src/getfullyqualifiedname.cpp
@@ -2,12 +2,13 @@
 //! @author George Fleming <v-geflem@microsoft.com>
 //! @brief Implements GetFullyQualifiedName on Linux
 
+#include "getcomputername.h"
+#include "getfullyqualifiedname.h"
+
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
-#include "getcomputername.h"
-#include "getfullyqualifiedname.h"
 
 //! @brief GetFullyQualifiedName retrieves the fully qualified dns name of the host
 //!
diff --git a/src/libpsl-native/src/getlinkcount.cpp b/src/libpsl-native/src/getlinkcount.cpp
index 2230d7a38..552b46ce5 100644
--- a/src/libpsl-native/src/getlinkcount.cpp
+++ b/src/libpsl-native/src/getlinkcount.cpp
@@ -2,13 +2,14 @@
 //! @author George FLeming <v-geflem@microsoft.com>
 //! @brief Retrieve link count of a file
 
+#include "getlinkcount.h"
+
 #include <errno.h>
 #include <locale.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <string>
-#include "getlinkcount.h"
 
 //! @brief GetLinkCount retrieves the file link count (number of hard links)
 //! for the given file
diff --git a/src/libpsl-native/src/getlstat.cpp b/src/libpsl-native/src/getlstat.cpp
index d2fcb6969..b8ba8a00c 100644
--- a/src/libpsl-native/src/getlstat.cpp
+++ b/src/libpsl-native/src/getlstat.cpp
@@ -2,13 +2,14 @@
 //! @author Andrew Schwartzmeyer <andschwa@microsoft.com>
 //! @brief returns the lstat of a file
 
+#include "getlstat.h"
+
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <pwd.h>
 #include <string.h>
 #include <unistd.h>
-#include "getlstat.h"
 
 //! @brief GetLStat returns the lstat of a file. This simply delegates to the
 //! lstat() system call and maps errno to the expected values for GetLastError.
diff --git a/src/libpsl-native/src/getlstat.h b/src/libpsl-native/src/getlstat.h
index ba746dd35..6cb4d4719 100644
--- a/src/libpsl-native/src/getlstat.h
+++ b/src/libpsl-native/src/getlstat.h
@@ -1,8 +1,9 @@
 #pragma once
 
-#include <sys/stat.h>
 #include "pal.h"
 
+#include <sys/stat.h>
+
 PAL_BEGIN_EXTERNC
 
 int32_t GetLStat(const char* path, struct stat* buf);
diff --git a/src/libpsl-native/src/getpwuid.cpp b/src/libpsl-native/src/getpwuid.cpp
index 62263067e..d28a28de2 100644
--- a/src/libpsl-native/src/getpwuid.cpp
+++ b/src/libpsl-native/src/getpwuid.cpp
@@ -2,13 +2,14 @@
 //! @author Andrew Schwartzmeyer <andschwa@microsoft.com>
 //! @brief returns the username for a uid
 
+#include "getpwuid.h"
+
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <pwd.h>
 #include <string.h>
 #include <unistd.h>
-#include "getpwuid.h"
 
 //! @brief GetPwUid returns the username for a uid
 //!
diff --git a/src/libpsl-native/src/getpwuid.h b/src/libpsl-native/src/getpwuid.h
index cbf2cca91..d573a8292 100644
--- a/src/libpsl-native/src/getpwuid.h
+++ b/src/libpsl-native/src/getpwuid.h
@@ -1,8 +1,9 @@
 #pragma once
 
-#include <sys/types.h>
 #include "pal.h"
 
+#include <sys/types.h>
+
 PAL_BEGIN_EXTERNC
 
 char* GetPwUid(uid_t uid);
diff --git a/src/libpsl-native/src/getstat.cpp b/src/libpsl-native/src/getstat.cpp
index 8fd666221..05e9ea479 100644
--- a/src/libpsl-native/src/getstat.cpp
+++ b/src/libpsl-native/src/getstat.cpp
@@ -2,13 +2,14 @@
 //! @author Andrew Schwartzmeyer <andschwa@microsoft.com>
 //! @brief returns the stat of a file
 
+#include "getstat.h"
+
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <pwd.h>
 #include <string.h>
 #include <unistd.h>
-#include "getstat.h"
 
 //! @brief GetStat returns the stat of a file. This simply delegates to the
 //! stat() system call and maps errno to the expected values for GetLastError.
diff --git a/src/libpsl-native/src/getstat.h b/src/libpsl-native/src/getstat.h
index 00bc26e9f..7f680470d 100644
--- a/src/libpsl-native/src/getstat.h
+++ b/src/libpsl-native/src/getstat.h
@@ -1,8 +1,9 @@
 #pragma once
 
-#include <sys/stat.h>
 #include "pal.h"
 
+#include <sys/stat.h>
+
 PAL_BEGIN_EXTERNC
 
 int32_t GetStat(const char* path, struct stat* buf);
diff --git a/src/libpsl-native/src/getuserfrompid.cpp b/src/libpsl-native/src/getuserfrompid.cpp
index fd148a9ff..2211becf8 100644
--- a/src/libpsl-native/src/getuserfrompid.cpp
+++ b/src/libpsl-native/src/getuserfrompid.cpp
@@ -1,12 +1,13 @@
-#include <string>
-#include <sstream>
-#include <errno.h>
-#include <sys/sysctl.h>
 #include "pal.h"
 #include "getfileowner.h"
 #include "getpwuid.h"
 #include "getuserfrompid.h"
 
+#include <string>
+#include <sstream>
+#include <errno.h>
+#include <sys/sysctl.h>
+
 char* GetUserFromPid(pid_t pid)
 {
 
diff --git a/src/libpsl-native/src/getuserfrompid.h b/src/libpsl-native/src/getuserfrompid.h
index c019f475f..65ce612da 100644
--- a/src/libpsl-native/src/getuserfrompid.h
+++ b/src/libpsl-native/src/getuserfrompid.h
@@ -2,6 +2,8 @@
 
 #include "pal.h"
 
+#include <sys/types.h>
+
 PAL_BEGIN_EXTERNC
 
 char* GetUserFromPid(pid_t pid);
diff --git a/src/libpsl-native/src/getusername.cpp b/src/libpsl-native/src/getusername.cpp
index 56c3d6d08..e2bbe95bd 100644
--- a/src/libpsl-native/src/getusername.cpp
+++ b/src/libpsl-native/src/getusername.cpp
@@ -2,10 +2,11 @@
 //! @author Andrew Schwartzmeyer <andschwa@microsoft.com>
 //! @brief Implements GetUserName for Linux
 
-#include <unistd.h>
 #include "getpwuid.h"
 #include "getusername.h"
 
+#include <unistd.h>
+
 //! @brief GetUserName retrieves the name of the user associated with
 //! the current thread.
 //!
diff --git a/src/libpsl-native/src/isdirectory.cpp b/src/libpsl-native/src/isdirectory.cpp
index f8b6bfe74..5e6131162 100644
--- a/src/libpsl-native/src/isdirectory.cpp
+++ b/src/libpsl-native/src/isdirectory.cpp
@@ -2,16 +2,17 @@
 //! @author Andrew Schwartzmeyer <andschwa@microsoft.com>
 //! @brief returns if the path is a directory
 
+#include "getstat.h"
+#include "getpwuid.h"
+#include "getfileowner.h"
+#include "isdirectory.h"
+
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <pwd.h>
 #include <string.h>
 #include <unistd.h>
-#include "getstat.h"
-#include "getpwuid.h"
-#include "getfileowner.h"
-#include "isdirectory.h"
 
 //! @brief returns if the path is a directory; uses stat and so follows symlinks
 //!
diff --git a/src/libpsl-native/src/isdirectory.h b/src/libpsl-native/src/isdirectory.h
index 746d1c579..fdf52b22b 100644
--- a/src/libpsl-native/src/isdirectory.h
+++ b/src/libpsl-native/src/isdirectory.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "pal.h"
+
 #include <stdbool.h>
 
 PAL_BEGIN_EXTERNC
diff --git a/src/libpsl-native/src/isexecutable.cpp b/src/libpsl-native/src/isexecutable.cpp
index a06fab57a..c702ccf3b 100644
--- a/src/libpsl-native/src/isexecutable.cpp
+++ b/src/libpsl-native/src/isexecutable.cpp
@@ -2,10 +2,11 @@
 //! @author George Fleming <v-geflem@microsoft.com>
 //! @brief returns whether a file is executable
 
+#include "isexecutable.h"
+
 #include <errno.h>
 #include <unistd.h>
 #include <string>
-#include "isexecutable.h"
 
 //! @brief IsExecutable determines if path is executable
 //!
diff --git a/src/libpsl-native/src/isexecutable.h b/src/libpsl-native/src/isexecutable.h
index f4278b954..f5fcb5b74 100644
--- a/src/libpsl-native/src/isexecutable.h
+++ b/src/libpsl-native/src/isexecutable.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "pal.h"
+
 #include <stdbool.h>
 
 PAL_BEGIN_EXTERNC
diff --git a/src/libpsl-native/src/isfile.cpp b/src/libpsl-native/src/isfile.cpp
index 1f6d0c59e..e348b105e 100644
--- a/src/libpsl-native/src/isfile.cpp
+++ b/src/libpsl-native/src/isfile.cpp
@@ -2,6 +2,9 @@
 //! @author Andrew Schwartzmeyer <andschwa@microsoft.com>
 //! @brief returns if the path exists
 
+#include "getlstat.h"
+#include "isfile.h"
+
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -9,8 +12,6 @@
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include "getlstat.h"
-#include "isfile.h"
 
 //! @brief returns if the path is a file or directory
 //!
diff --git a/src/libpsl-native/src/isfile.h b/src/libpsl-native/src/isfile.h
index 53a15f97d..1aa6677c2 100644
--- a/src/libpsl-native/src/isfile.h
+++ b/src/libpsl-native/src/isfile.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "pal.h"
+
 #include <stdbool.h>
 
 PAL_BEGIN_EXTERNC
diff --git a/src/libpsl-native/src/issymlink.cpp b/src/libpsl-native/src/issymlink.cpp
index 87a8a2e8d..00a73f1ef 100644
--- a/src/libpsl-native/src/issymlink.cpp
+++ b/src/libpsl-native/src/issymlink.cpp
@@ -2,13 +2,14 @@
 //! @author George FLeming <v-geflem@microsoft.com>
 //! @brief returns whether a path is a symbolic link
 
+#include "getlstat.h"
+#include "issymlink.h"
+
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <string>
-#include "getlstat.h"
-#include "issymlink.h"
 
 //! @brief IsSymlink determines if path is a symbolic link
 //!
diff --git a/src/libpsl-native/src/issymlink.h b/src/libpsl-native/src/issymlink.h
index ebe3733c5..110648458 100644
--- a/src/libpsl-native/src/issymlink.h
+++ b/src/libpsl-native/src/issymlink.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "pal.h"
+
 #include <stdbool.h>
 
 PAL_BEGIN_EXTERNC
diff --git a/src/libpsl-native/src/setdate.cpp b/src/libpsl-native/src/setdate.cpp
index 81bfa3417..3a2c179d7 100644
--- a/src/libpsl-native/src/setdate.cpp
+++ b/src/libpsl-native/src/setdate.cpp
@@ -2,13 +2,14 @@
 //! @author George FLeming <v-geflem@microsoft.com>
 //! @brief set local/system date and time
 
+#include "setdate.h"
+
 #include <errno.h>
 #include <langinfo.h>
 #include <locale.h>
 #include <string>
 #include <time.h>
 #include <sys/time.h>
-#include "setdate.h"
 
 //! @brief SetDate sets the date and time on local computer.  You must 
 //!      be super-user to set the time.