Rename cynara-client-error.h to cynara-error.h

Apply new name to all files.

Change-Id: I9e4590a40e11ba5a33442707207635bb0d75a278

diff --git a/packaging/cynara.spec b/packaging/cynara.spec
index 17746c8..e8d0bc8 100644 (file)
--- a/packaging/cynara.spec
+++ b/packaging/cynara.spec
@@ -431,7 +431,7 @@ fi
 %{_libdir}/libcynara-client-commons.so.*
 
 %files -n libcynara-client-commons-devel
-%{_includedir}/cynara/cynara-client-error.h
+%{_includedir}/cynara/cynara-error.h
 %{_libdir}/libcynara-client-commons.so
 
 %files -n libcynara-admin

diff --git a/src/admin/api/admin-api.cpp b/src/admin/api/admin-api.cpp
index 929b075..0df64f3 100644 (file)
--- a/src/admin/api/admin-api.cpp
+++ b/src/admin/api/admin-api.cpp
@@ -37,7 +37,7 @@
 #include <types/PolicyType.h>
 
 #include <cynara-admin.h>
-#include <cynara-client-error.h>
+#include <cynara-error.h>
 
 #include <api/ApiInterface.h>
 #include <logic/Logic.h>

diff --git a/src/admin/logic/Logic.cpp b/src/admin/logic/Logic.cpp
index d36651e..683a2cf 100644 (file)
--- a/src/admin/logic/Logic.cpp
+++ b/src/admin/logic/Logic.cpp
@@ -23,7 +23,7 @@
 #include <cinttypes>
 #include <memory>
 
-#include <cynara-client-error.h>
+#include <cynara-error.h>
 #include <common.h>
 #include <exceptions/Exception.h>
 #include <exceptions/UnexpectedErrorException.h>

diff --git a/src/client-common/cache/CapacityCache.cpp b/src/client-common/cache/CapacityCache.cpp
index c6449bc..d07bb2c 100644 (file)
--- a/src/client-common/cache/CapacityCache.cpp
+++ b/src/client-common/cache/CapacityCache.cpp
@@ -22,7 +22,7 @@
 
 #include <cinttypes>
 
-#include <cynara-client-error.h>
+#include <cynara-error.h>
 #include <log/log.h>
 
 #include <cache/CapacityCache.h>

diff --git a/src/client-common/exceptions/TryCatch.h b/src/client-common/exceptions/TryCatch.h
index 6dc4d0b..08b93d9 100644 (file)
--- a/src/client-common/exceptions/TryCatch.h
+++ b/src/client-common/exceptions/TryCatch.h
@@ -30,7 +30,7 @@
 #include <exceptions/NoMemoryException.h>
 #include <log/log.h>
 
-#include <cynara-client-error.h>
+#include <cynara-error.h>
 
 namespace Cynara {
 

diff --git a/src/client-common/plugins/NaiveInterpreter.h b/src/client-common/plugins/NaiveInterpreter.h
index e306ab7..e9e8ba4 100644 (file)
--- a/src/client-common/plugins/NaiveInterpreter.h
+++ b/src/client-common/plugins/NaiveInterpreter.h
@@ -24,7 +24,7 @@
 
 #include <attributes/attributes.h>
 #include <cache/CacheInterface.h>
-#include <cynara-client-error.h>
+#include <cynara-error.h>
 
 namespace Cynara {
 

diff --git a/src/client/api/client-api.cpp b/src/client/api/client-api.cpp
index 6ca7def..4eb4625 100644 (file)
--- a/src/client/api/client-api.cpp
+++ b/src/client/api/client-api.cpp
@@ -28,7 +28,7 @@
 #include <log/log.h>
 
 #include <cynara-client.h>
-#include <cynara-client-error.h>
+#include <cynara-error.h>
 #include <api/ApiInterface.h>
 #include <logic/Logic.h>
 

diff --git a/src/client/logic/Logic.cpp b/src/client/logic/Logic.cpp
index f375e9e..4886b78 100644 (file)
--- a/src/client/logic/Logic.cpp
+++ b/src/client/logic/Logic.cpp
@@ -24,7 +24,7 @@
 
 #include <cache/CapacityCache.h>
 #include <common.h>
-#include <cynara-client-error.h>
+#include <cynara-error.h>
 #include <exceptions/Exception.h>
 #include <exceptions/UnexpectedErrorException.h>
 #include <log/log.h>

diff --git a/src/helpers/creds-commons/creds-commons.cpp b/src/helpers/creds-commons/creds-commons.cpp
index 3fa1c9b..35d2ac7 100644 (file)
--- a/src/helpers/creds-commons/creds-commons.cpp
+++ b/src/helpers/creds-commons/creds-commons.cpp
@@ -24,8 +24,8 @@
 
 #include <attributes/attributes.h>
 
-#include <cynara-client-error.h>
 #include <cynara-creds-commons.h>
+#include <cynara-error.h>
 
 CYNARA_API
 int cynara_creds_get_default_client_method(enum cynara_client_creds *method) {

diff --git a/src/helpers/creds-dbus/creds-dbus-inner.cpp b/src/helpers/creds-dbus/creds-dbus-inner.cpp
index 34ad453..fc48217 100644 (file)
--- a/src/helpers/creds-dbus/creds-dbus-inner.cpp
+++ b/src/helpers/creds-dbus/creds-dbus-inner.cpp
@@ -26,7 +26,7 @@
 #include <string>
 #include <string.h>
 
-#include <cynara-client-error.h>
+#include <cynara-error.h>
 
 #include "creds-dbus-inner.h"
 

diff --git a/src/helpers/creds-dbus/creds-dbus.cpp b/src/helpers/creds-dbus/creds-dbus.cpp
index e0b235d..4bca2a5 100644 (file)
--- a/src/helpers/creds-dbus/creds-dbus.cpp
+++ b/src/helpers/creds-dbus/creds-dbus.cpp
@@ -27,9 +27,9 @@
 
 #include <creds-dbus-inner.h>
 
-#include <cynara-client-error.h>
 #include <cynara-creds-commons.h>
 #include <cynara-creds-dbus.h>
+#include <cynara-error.h>
 
 CYNARA_API
 int cynara_creds_dbus_get_client(DBusConnection *connection, const char *uniqueName,

diff --git a/src/helpers/creds-socket/creds-socket-inner.cpp b/src/helpers/creds-socket/creds-socket-inner.cpp
index 320fca5..bb4ebcc 100644 (file)
--- a/src/helpers/creds-socket/creds-socket-inner.cpp
+++ b/src/helpers/creds-socket/creds-socket-inner.cpp
@@ -30,7 +30,7 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 
-#include <cynara-client-error.h>
+#include <cynara-error.h>
 
 #include "creds-socket-inner.h"
 

diff --git a/src/helpers/creds-socket/creds-socket.cpp b/src/helpers/creds-socket/creds-socket.cpp
index d60c241..fb5f963 100644 (file)
--- a/src/helpers/creds-socket/creds-socket.cpp
+++ b/src/helpers/creds-socket/creds-socket.cpp
@@ -29,9 +29,9 @@
 
 #include <creds-socket-inner.h>
 
-#include <cynara-client-error.h>
 #include <cynara-creds-commons.h>
 #include <cynara-creds-socket.h>
+#include <cynara-error.h>
 
 CYNARA_API
 int cynara_creds_socket_get_client(int socket_fd, enum cynara_client_creds method, char **client) {

diff --git a/src/include/CMakeLists.txt b/src/include/CMakeLists.txt
index a6c1945..245962d 100644 (file)
--- a/src/include/CMakeLists.txt
+++ b/src/include/CMakeLists.txt
@@ -21,10 +21,10 @@ INSTALL(FILES
     ${CYNARA_PATH}/include/cynara-admin-types.h
     ${CYNARA_PATH}/include/cynara-client.h
     ${CYNARA_PATH}/include/cynara-client-async.h
-    ${CYNARA_PATH}/include/cynara-client-error.h
     ${CYNARA_PATH}/include/cynara-creds-commons.h
     ${CYNARA_PATH}/include/cynara-creds-dbus.h
     ${CYNARA_PATH}/include/cynara-creds-socket.h
+    ${CYNARA_PATH}/include/cynara-error.h
     ${CYNARA_PATH}/include/cynara-plugin.h
     ${CYNARA_PATH}/include/cynara-session.h
     DESTINATION ${INCLUDE_INSTALL_DIR}/cynara

diff --git a/src/include/cynara-admin.h b/src/include/cynara-admin.h
index 6f5bc9e..0e92b18 100644 (file)
--- a/src/include/cynara-admin.h
+++ b/src/include/cynara-admin.h
@@ -24,7 +24,7 @@
 #define CYNARA_ADMIN_H
 
 #include <cynara-admin-types.h>
-#include <cynara-client-error.h>
+#include <cynara-error.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/include/cynara-client-async.h b/src/include/cynara-client-async.h
index 1e39d9b..20f5ea4 100644 (file)
--- a/src/include/cynara-client-async.h
+++ b/src/include/cynara-client-async.h
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#include <cynara-client-error.h>
+#include <cynara-error.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/include/cynara-client.h b/src/include/cynara-client.h
index 3f4c938..571bef1 100644 (file)
--- a/src/include/cynara-client.h
+++ b/src/include/cynara-client.h
@@ -23,7 +23,7 @@
 #ifndef CYNARA_CLIENT_H
 #define CYNARA_CLIENT_H
 
-#include <cynara-client-error.h>
+#include <cynara-error.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/include/cynara-creds-commons.h b/src/include/cynara-creds-commons.h
index 0bb3e69..75e4366 100644 (file)
--- a/src/include/cynara-creds-commons.h
+++ b/src/include/cynara-creds-commons.h
@@ -26,7 +26,7 @@
 #ifndef CYNARA_CREDS_COMMONS_H
 #define CYNARA_CREDS_COMMONS_H
 
-#include <cynara-client-error.h>
+#include <cynara-error.h>
 
 enum cynara_client_creds {
     CLIENT_METHOD_SMACK,

diff --git a/src/include/cynara-client-error.h b/src/include/cynara-error.h
similarity index 90%
rename from src/include/cynara-client-error.h
rename to src/include/cynara-error.h
index d4d8bcc..e8900b8 100644 (file)
--- a/src/include/cynara-client-error.h
+++ b/src/include/cynara-error.h
@@ -14,15 +14,15 @@
  *  limitations under the License
  */
 /**
- * @file        src/include/cynara-client-error.h
+ * @file        src/include/cynara-error.h
  * @author      Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>
  * @author      Zofia Abramowska <z.abramowska@samsung.com>
  * @version     1.0
- * @brief       This file contains error codes returned by client APIs of Cynara.
+ * @brief       This file contains error codes returned by APIs of Cynara.
  */
 
-#ifndef CYNARA_CLIENT_ERROR_H
-#define CYNARA_CLIENT_ERROR_H
+#ifndef CYNARA_ERROR_H
+#define CYNARA_ERROR_H
 
 /**
  * \name Return Codes
@@ -69,4 +69,4 @@
 
 /** @}*/
 
-#endif /* CYNARA_CLIENT_ERROR_H */
+#endif /* CYNARA_ERROR_H */

diff --git a/src/include/cynara-offline-admin.h b/src/include/cynara-offline-admin.h
index 079ebd3..dbecc78 100644 (file)
--- a/src/include/cynara-offline-admin.h
+++ b/src/include/cynara-offline-admin.h
@@ -26,7 +26,7 @@
 #define CYNARA_OFFLINE_ADMIN_H
 
 #include <cynara-admin-types.h>
-#include <cynara-client-error.h>
+#include <cynara-error.h>
 
 #ifdef __cplusplus
 extern "C" {