From 00a5cd1d43e485e9ced6789c041498f5785e58b4 Mon Sep 17 00:00:00 2001 From: Lucian Petrut Date: Tue, 5 May 2020 10:20:46 +0000 Subject: [PATCH] common: move Windows files to a separate folder We ended up with quite a few files having the "_win32" suffix. It's probably better if we move them to a separate folder and drop the suffix. Signed-off-by: Lucian Petrut --- src/common/CMakeLists.txt | 16 ++++++++-------- .../{SubProcess_win32.cc => win32/SubProcess.cc} | 13 ++++++++++++- src/common/{blkdev_win32.cc => win32/blkdev.cc} | 2 +- src/common/{dlfcn_win32.cc => win32/dlfcn.cc} | 0 .../dns_resolve.cc} | 2 +- src/common/{win32_errno.cc => win32/errno.cc} | 0 .../{ifaddrs_win32.cc => win32/ifaddrs.cc} | 0 .../{registry_win32.cc => win32/registry.cc} | 2 +- .../{registry_win32.h => win32/registry.h} | 0 .../{service_win32.cc => win32/service.cc} | 2 +- src/common/{service_win32.h => win32/service.h} | 0 11 files changed, 24 insertions(+), 13 deletions(-) rename src/common/{SubProcess_win32.cc => win32/SubProcess.cc} (95%) rename src/common/{blkdev_win32.cc => win32/blkdev.cc} (98%) rename src/common/{dlfcn_win32.cc => win32/dlfcn.cc} (100%) rename src/common/{dns_resolve_win32.cc => win32/dns_resolve.cc} (97%) rename src/common/{win32_errno.cc => win32/errno.cc} (100%) rename src/common/{ifaddrs_win32.cc => win32/ifaddrs.cc} (100%) rename src/common/{registry_win32.cc => win32/registry.cc} (99%) rename src/common/{registry_win32.h => win32/registry.h} (100%) rename src/common/{service_win32.cc => win32/service.cc} (99%) rename src/common/{service_win32.h => win32/service.h} (100%) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index efd1b24440dd6..e9a732ba9161f 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -8,7 +8,7 @@ add_library(common_prioritycache_obj OBJECT PriorityCache.cc) if(WIN32) - add_library(dlfcn_win32 STATIC dlfcn_win32.cc win32_errno.cc) + add_library(dlfcn_win32 STATIC win32/dlfcn.cc win32/errno.cc) endif() set(common_srcs @@ -105,12 +105,12 @@ set(common_srcs if(WIN32) list(APPEND common_srcs - blkdev_win32.cc - dns_resolve_win32.cc - SubProcess_win32.cc - ifaddrs_win32.c - registry_win32.cc - service_win32.cc) + win32/blkdev.cc + win32/dns_resolve.cc + win32/ifaddrs.cc + win32/registry.cc + win32/service.cc + win32/SubProcess.cc) else() list(APPEND common_srcs blkdev.cc @@ -138,7 +138,7 @@ elseif(SUN) elseif(AIX) list(APPEND common_srcs aix_errno.cc) elseif(WIN32) - list(APPEND common_srcs win32_errno.cc) + list(APPEND common_srcs win32/errno.cc) endif() if(WITH_EVENTTRACE) diff --git a/src/common/SubProcess_win32.cc b/src/common/win32/SubProcess.cc similarity index 95% rename from src/common/SubProcess_win32.cc rename to src/common/win32/SubProcess.cc index 0e4d13dd71a60..565cb47f0faae 100644 --- a/src/common/SubProcess_win32.cc +++ b/src/common/win32/SubProcess.cc @@ -1,4 +1,14 @@ -#include "SubProcess.h" +/* + * Ceph - scalable distributed file system + * + * Copyright (C) 2020 SUSE LINUX GmbH + * + * This is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software + * Foundation. See file COPYING. + * + */ #include #include @@ -6,6 +16,7 @@ #include #include +#include "common/SubProcess.h" #include "common/errno.h" #include "include/ceph_assert.h" #include "include/compat.h" diff --git a/src/common/blkdev_win32.cc b/src/common/win32/blkdev.cc similarity index 98% rename from src/common/blkdev_win32.cc rename to src/common/win32/blkdev.cc index c3e28e343ff83..bb815a044fc34 100644 --- a/src/common/blkdev_win32.cc +++ b/src/common/win32/blkdev.cc @@ -13,7 +13,7 @@ */ #include -#include "blkdev.h" +#include "common/blkdev.h" int get_device_by_path(const char *path, char* partition, char* device, size_t max) diff --git a/src/common/dlfcn_win32.cc b/src/common/win32/dlfcn.cc similarity index 100% rename from src/common/dlfcn_win32.cc rename to src/common/win32/dlfcn.cc diff --git a/src/common/dns_resolve_win32.cc b/src/common/win32/dns_resolve.cc similarity index 97% rename from src/common/dns_resolve_win32.cc rename to src/common/win32/dns_resolve.cc index b7a888b30ebe1..8a7c80bff0434 100644 --- a/src/common/dns_resolve_win32.cc +++ b/src/common/win32/dns_resolve.cc @@ -13,7 +13,7 @@ */ #include "include/scope_guard.h" -#include "dns_resolve.h" +#include "common/dns_resolve.h" #include "common/debug.h" #define dout_subsys ceph_subsys_ diff --git a/src/common/win32_errno.cc b/src/common/win32/errno.cc similarity index 100% rename from src/common/win32_errno.cc rename to src/common/win32/errno.cc diff --git a/src/common/ifaddrs_win32.cc b/src/common/win32/ifaddrs.cc similarity index 100% rename from src/common/ifaddrs_win32.cc rename to src/common/win32/ifaddrs.cc diff --git a/src/common/registry_win32.cc b/src/common/win32/registry.cc similarity index 99% rename from src/common/registry_win32.cc rename to src/common/win32/registry.cc index eb809a40f79ce..d032e3b602ab8 100644 --- a/src/common/registry_win32.cc +++ b/src/common/win32/registry.cc @@ -15,7 +15,7 @@ #include "common/debug.h" #include "common/errno.h" -#include "common/registry_win32.h" +#include "common/win32/registry.h" RegistryKey::RegistryKey(CephContext *cct_, HKEY hRootKey, LPCTSTR strKey, bool create_value): cct(cct_) diff --git a/src/common/registry_win32.h b/src/common/win32/registry.h similarity index 100% rename from src/common/registry_win32.h rename to src/common/win32/registry.h diff --git a/src/common/service_win32.cc b/src/common/win32/service.cc similarity index 99% rename from src/common/service_win32.cc rename to src/common/win32/service.cc index 6297531d3de33..df0e834137cbd 100644 --- a/src/common/service_win32.cc +++ b/src/common/win32/service.cc @@ -15,7 +15,7 @@ #include "common/debug.h" #include "common/errno.h" -#include "common/service_win32.h" +#include "common/win32/service.h" // Initialize the singleton service instance. ServiceBase *ServiceBase::s_service = NULL; diff --git a/src/common/service_win32.h b/src/common/win32/service.h similarity index 100% rename from src/common/service_win32.h rename to src/common/win32/service.h -- 2.39.5