From 150674f341853ef37e2c095556c4b32ea06076f1 Mon Sep 17 00:00:00 2001
From: Armin Novak <armin.novak@thincast.com>
Date: Wed, 23 Feb 2022 16:26:14 +0100
Subject: [PATCH] Moved headers to appropriate places

---
 client/common/cmdline.c                                     | 2 +-
 client/common/smartcard_cli.c                               | 4 ++--
 include/freerdp/{ => client}/utils/smartcard_cli.h          | 0
 {libfreerdp/core => include/freerdp/utils}/smartcardlogon.h | 3 +--
 libfreerdp/core/CMakeLists.txt                              | 1 -
 libfreerdp/core/nla.c                                       | 2 +-
 libfreerdp/core/smartcardlogon.c                            | 2 +-
 7 files changed, 6 insertions(+), 8 deletions(-)
 rename include/freerdp/{ => client}/utils/smartcard_cli.h (100%)
 rename {libfreerdp/core => include/freerdp/utils}/smartcardlogon.h (96%)

diff --git a/client/common/cmdline.c b/client/common/cmdline.c
index 7785de8f3..f4f87a55b 100644
--- a/client/common/cmdline.c
+++ b/client/common/cmdline.c
@@ -54,7 +54,7 @@
 
 #include <freerdp/client/cmdline.h>
 #include <freerdp/version.h>
-#include <freerdp/utils/smartcard_cli.h>
+#include <freerdp/client/utils/smartcard_cli.h>
 
 #include "cmdline.h"
 
diff --git a/client/common/smartcard_cli.c b/client/common/smartcard_cli.c
index 406501e7d..f499f9358 100644
--- a/client/common/smartcard_cli.c
+++ b/client/common/smartcard_cli.c
@@ -19,8 +19,8 @@
 
 #include <winpr/assert.h>
 
-#include <freerdp/utils/smartcard_cli.h>
-#include "../../libfreerdp/core/smartcardlogon.h"
+#include <freerdp/client/utils/smartcard_cli.h>
+#include <freerdp/utils/smartcardlogon.h>
 
 BOOL freerdp_smartcard_list(const rdpSettings* settings)
 {
diff --git a/include/freerdp/utils/smartcard_cli.h b/include/freerdp/client/utils/smartcard_cli.h
similarity index 100%
rename from include/freerdp/utils/smartcard_cli.h
rename to include/freerdp/client/utils/smartcard_cli.h
diff --git a/libfreerdp/core/smartcardlogon.h b/include/freerdp/utils/smartcardlogon.h
similarity index 96%
rename from libfreerdp/core/smartcardlogon.h
rename to include/freerdp/utils/smartcardlogon.h
index a7aaecbdd..97ac28385 100644
--- a/libfreerdp/core/smartcardlogon.h
+++ b/include/freerdp/utils/smartcardlogon.h
@@ -42,9 +42,8 @@ typedef struct
 } SmartcardCertInfo;
 
 FREERDP_API BOOL smartcard_enumerateCerts(const rdpSettings* settings, SmartcardCerts** scCert,
-                              DWORD* retCount);
+                                          DWORD* retCount);
 FREERDP_API const SmartcardCertInfo* smartcard_getCertInfo(SmartcardCerts* scCerts, DWORD index);
 FREERDP_API void smartcardCerts_Free(SmartcardCerts* scCert);
 
-
 #endif /* LIBFREERDP_CORE_SMARTCARDLOGON_H */
diff --git a/libfreerdp/core/CMakeLists.txt b/libfreerdp/core/CMakeLists.txt
index 52e88eecb..344d41134 100644
--- a/libfreerdp/core/CMakeLists.txt
+++ b/libfreerdp/core/CMakeLists.txt
@@ -64,7 +64,6 @@ set(${MODULE_PREFIX}_SRCS
 	nla.c
 	nla.h
 	smartcardlogon.c
-	smartcardlogon.h
 	tscredentials.c
 	tscredentials.h
 	nego.c
diff --git a/libfreerdp/core/nla.c b/libfreerdp/core/nla.c
index aed315607..8a85be979 100644
--- a/libfreerdp/core/nla.c
+++ b/libfreerdp/core/nla.c
@@ -50,7 +50,7 @@
 #include "nla.h"
 #include "utils.h"
 #include "tscredentials.h"
-#include "smartcardlogon.h"
+#include <freerdp/utils/smartcardlogon.h>
 
 #define TAG FREERDP_TAG("core.nla")
 
diff --git a/libfreerdp/core/smartcardlogon.c b/libfreerdp/core/smartcardlogon.c
index 022da4d68..22fa2ebc7 100644
--- a/libfreerdp/core/smartcardlogon.c
+++ b/libfreerdp/core/smartcardlogon.c
@@ -33,7 +33,7 @@
 
 #include <freerdp/log.h>
 
-#include "smartcardlogon.h"
+#include <freerdp/utils/smartcardlogon.h>
 
 #define TAG FREERDP_TAG("smartcardlogon")